Merge branch 'new/bug11240'
authorGalen Charlton <gmc@esilibrary.com>
Thu, 14 Nov 2013 23:06:17 +0000 (23:06 +0000)
committerGalen Charlton <gmc@esilibrary.com>
Thu, 14 Nov 2013 23:06:17 +0000 (23:06 +0000)

Trivial merge