Merge branch 'master' of git://git.evergreen-ils.org/Evergreen
authorThomas Berezansky <tsbere@mvlc.org>
Tue, 2 Aug 2011 16:09:33 +0000 (12:09 -0400)
committerThomas Berezansky <tsbere@mvlc.org>
Tue, 2 Aug 2011 16:09:33 +0000 (12:09 -0400)

Trivial merge