Merge branch 'collab/dbs/social' of git://git.evergreen-ils.org/working/Evergreen...
authorMike Rylander <mrylander@gmail.com>
Wed, 18 May 2011 16:15:48 +0000 (12:15 -0400)
committerMike Rylander <mrylander@gmail.com>
Wed, 18 May 2011 16:15:48 +0000 (12:15 -0400)

Trivial merge