Merge branch 'bug_9239' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 17 Mar 2013 01:38:47 +0000 (21:38 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 17 Mar 2013 01:38:47 +0000 (21:38 -0400)

Trivial merge