Merge remote branch 'working/user/dbwells/shared_siss_editor' into rel_2_2
authorLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Tue, 3 Apr 2012 16:58:53 +0000 (12:58 -0400)
committerLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Tue, 3 Apr 2012 16:58:53 +0000 (12:58 -0400)
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

Trivial merge