Merge branch 'bug_9045' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 21 Mar 2013 14:47:47 +0000 (10:47 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 21 Mar 2013 14:47:47 +0000 (10:47 -0400)

Trivial merge