Merge branch 'bug_9696' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 14:55:24 +0000 (09:55 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 14:55:24 +0000 (09:55 -0500)

Trivial merge