Merge branch 'bug_9669' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 1 Mar 2013 00:14:49 +0000 (19:14 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 1 Mar 2013 00:14:49 +0000 (19:14 -0500)

Trivial merge