Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Mon, 22 Oct 2012 15:57:03 +0000 (11:57 -0400)
committerEquinox <info@esilibrary.com>
Mon, 22 Oct 2012 15:57:03 +0000 (11:57 -0400)

Trivial merge