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

Trivial merge