Merge branch 'trunk' of git://git.mvlcstaff.org/tsbere/ILS into installer
authorThomas Berezansky <tsbere@mvlc.org>
Mon, 18 Apr 2011 21:36:53 +0000 (17:36 -0400)
committerThomas Berezansky <tsbere@mvlc.org>
Mon, 18 Apr 2011 21:36:53 +0000 (17:36 -0400)

Trivial merge