Merge branch 'bug_9609' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 2 Apr 2013 12:41:43 +0000 (08:41 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 2 Apr 2013 12:41:43 +0000 (08:41 -0400)

Trivial merge