Merge branch 'master' of git://git.mvlcstaff.org/Evergreen/ILS into lp816627 collab/dyrcona/lp816627
authorJason Stephenson <jstephenson@mvlc.org>
Fri, 30 Sep 2011 13:00:21 +0000 (09:00 -0400)
committerJason Stephenson <jstephenson@mvlc.org>
Fri, 30 Sep 2011 13:00:21 +0000 (09:00 -0400)

Trivial merge