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

Trivial merge