Merge remote branch 'working/collab/dbs/rel_2_1-release_notes' into rel_2_1
authorGalen Charlton <gmc@esilibrary.com>
Tue, 8 Nov 2011 13:36:24 +0000 (08:36 -0500)
committerGalen Charlton <gmc@esilibrary.com>
Tue, 8 Nov 2011 13:36:32 +0000 (08:36 -0500)
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

Trivial merge