Merge branch 'bug_9680' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 12 May 2013 14:14:48 +0000 (10:14 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 12 May 2013 14:14:48 +0000 (10:14 -0400)

Trivial merge