Merge branch 'bug_9604' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 02:05:42 +0000 (22:05 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 02:05:42 +0000 (22:05 -0400)

Trivial merge