Merge branch 'bug_9209' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 29 Dec 2012 01:16:12 +0000 (20:16 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 29 Dec 2012 01:16:12 +0000 (20:16 -0500)

Trivial merge