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

Trivial merge