Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Sat, 19 Jan 2013 18:51:02 +0000 (13:51 -0500)
committerEquinox <info@esilibrary.com>
Sat, 19 Jan 2013 18:51:02 +0000 (13:51 -0500)

Trivial merge