Merge branch 'new/bug11221'
authorGalen Charlton <gmc@esilibrary.com>
Tue, 19 Nov 2013 15:45:22 +0000 (15:45 +0000)
committerGalen Charlton <gmc@esilibrary.com>
Tue, 19 Nov 2013 15:45:22 +0000 (15:45 +0000)

Trivial merge