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

Trivial merge