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

Trivial merge