Merge branch 'master' of git://git.mvlcstaff.org/Evergreen/ILS into lp816627
authorJason Stephenson <jstephenson@mvlc.org>
Wed, 10 Aug 2011 14:55:05 +0000 (10:55 -0400)
committerJason Stephenson <jstephenson@mvlc.org>
Wed, 10 Aug 2011 14:55:05 +0000 (10:55 -0400)

Trivial merge