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

Trivial merge