Merge branch 'bug_9438' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 21 Mar 2013 13:42:13 +0000 (09:42 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 21 Mar 2013 13:42:13 +0000 (09:42 -0400)

Trivial merge