Merge branch 'bug_9196' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 12:07:04 +0000 (08:07 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 12:07:04 +0000 (08:07 -0400)

Trivial merge