Merge branch 'bug_9284' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 28 Dec 2012 00:02:31 +0000 (19:02 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 28 Dec 2012 00:02:31 +0000 (19:02 -0500)

Trivial merge