Merge branch 'bug_9229' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 18 Jan 2013 02:02:58 +0000 (21:02 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 18 Jan 2013 02:02:58 +0000 (21:02 -0500)

Trivial merge