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

Trivial merge