Merge branch 'bug_9116' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 21 Jan 2013 13:55:47 +0000 (08:55 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 21 Jan 2013 13:55:47 +0000 (08:55 -0500)

Trivial merge