Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Wed, 6 Feb 2013 22:06:01 +0000 (17:06 -0500)
committerEquinox <info@esilibrary.com>
Wed, 6 Feb 2013 22:06:01 +0000 (17:06 -0500)

Trivial merge