Merge branch 'new/bug11185'
authorGalen Charlton <gmc@esilibrary.com>
Fri, 15 Nov 2013 15:31:58 +0000 (15:31 +0000)
committerGalen Charlton <gmc@esilibrary.com>
Fri, 15 Nov 2013 15:31:58 +0000 (15:31 +0000)

Trivial merge