Merge branch 'bug_9309' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 16 Jan 2013 03:02:22 +0000 (22:02 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 16 Jan 2013 03:02:22 +0000 (22:02 -0500)

Trivial merge