Merge branch 'bug_9002' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 31 Mar 2013 01:14:32 +0000 (21:14 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 31 Mar 2013 01:14:32 +0000 (21:14 -0400)

Trivial merge