Merge branch 'master' of git://git.mvlcstaff.org/Evergreen/ILS into lp816627
authorJason Stephenson <jstephenson@mvlc.org>
Tue, 6 Sep 2011 15:26:25 +0000 (11:26 -0400)
committerJason Stephenson <jstephenson@mvlc.org>
Tue, 6 Sep 2011 15:26:25 +0000 (11:26 -0400)

Trivial merge