Merge branch 'bug_9172' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 15 Apr 2013 13:32:07 +0000 (09:32 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 15 Apr 2013 13:32:07 +0000 (09:32 -0400)

Trivial merge