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

Trivial merge