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

Trivial merge