Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Thu, 31 May 2012 04:57:01 +0000 (04:57 +0000)
committerEquinox <info@esilibrary.com>
Thu, 31 May 2012 04:57:01 +0000 (04:57 +0000)

Trivial merge