Merge branch 'bug_9617' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 2 Mar 2013 16:58:50 +0000 (11:58 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 2 Mar 2013 16:58:50 +0000 (11:58 -0500)

Trivial merge