Merge branch 'trunk' of git://git.mvlcstaff.org/tsbere/ILS into installer
authorThomas Berezansky <tsbere@mvlc.org>
Fri, 6 May 2011 16:57:26 +0000 (12:57 -0400)
committerThomas Berezansky <tsbere@mvlc.org>
Fri, 6 May 2011 16:57:26 +0000 (12:57 -0400)

Trivial merge