Merge branch 'master' of git://git.mvlcstaff.org/Evergreen/ILS into lp816627
authorJason Stephenson <jstephenson@mvlc.org>
Mon, 26 Sep 2011 13:46:29 +0000 (09:46 -0400)
committerJason Stephenson <jstephenson@mvlc.org>
Mon, 26 Sep 2011 13:46:29 +0000 (09:46 -0400)

Trivial merge