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

Trivial merge