Merge branch 'bug_9151' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 22 Dec 2012 20:53:56 +0000 (15:53 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 22 Dec 2012 20:53:56 +0000 (15:53 -0500)

Trivial merge