Merge branch 'bug_9647' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 13 Mar 2013 13:01:51 +0000 (09:01 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 13 Mar 2013 13:01:51 +0000 (09:01 -0400)

Trivial merge