Merge branch 'bug_9734' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 11 Mar 2013 11:33:33 +0000 (07:33 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 11 Mar 2013 11:33:33 +0000 (07:33 -0400)

Trivial merge