Merge branch 'bug_6209' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 04:13:15 +0000 (00:13 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 04:13:15 +0000 (00:13 -0400)

Trivial merge