Merge branch 'bug_9954' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 31 Mar 2013 13:00:44 +0000 (09:00 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 31 Mar 2013 13:00:44 +0000 (09:00 -0400)

Trivial merge