Merge branch 'rel_2_1_1' of git.evergreen-ils.org:evergreen/pines into rel_2_1_1
authorChris Sharp <csharp@georgialibraries.org>
Sat, 3 Dec 2011 15:41:29 +0000 (10:41 -0500)
committerChris Sharp <csharp@georgialibraries.org>
Sat, 3 Dec 2011 15:41:29 +0000 (10:41 -0500)

Trivial merge