Merge branch 'master' of git://git.mvlcstaff.org/Evergreen/ILS into lp816627
authorJason Stephenson <jstephenson@mvlc.org>
Thu, 22 Sep 2011 19:16:40 +0000 (15:16 -0400)
committerJason Stephenson <jstephenson@mvlc.org>
Thu, 22 Sep 2011 19:16:40 +0000 (15:16 -0400)

Trivial merge