Merge branch 'bug_9644' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 18 Feb 2013 14:08:33 +0000 (09:08 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 18 Feb 2013 14:08:33 +0000 (09:08 -0500)

Trivial merge