Merge branch 'bug_9381' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 7 Apr 2013 17:49:09 +0000 (13:49 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 7 Apr 2013 17:49:09 +0000 (13:49 -0400)

Trivial merge