Merge branch 'bug_9256' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 19 Mar 2013 23:34:28 +0000 (19:34 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 19 Mar 2013 23:34:28 +0000 (19:34 -0400)

Trivial merge