Merge branch 'master' of git://git.mvlcstaff.org/Evergreen/ILS into lp816627
authorJason Stephenson <jstephenson@mvlc.org>
Wed, 7 Sep 2011 18:01:54 +0000 (14:01 -0400)
committerJason Stephenson <jstephenson@mvlc.org>
Wed, 7 Sep 2011 18:01:54 +0000 (14:01 -0400)

Trivial merge