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

Trivial merge