Merge branch 'bug_9639' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 18 Feb 2013 14:03:33 +0000 (09:03 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 18 Feb 2013 14:03:33 +0000 (09:03 -0500)

Trivial merge