Merge branch 'master' of git://git.mvlcstaff.org/tsbere/ILS into installer
authorThomas Berezansky <tsbere@mvlc.org>
Wed, 25 May 2011 02:12:46 +0000 (22:12 -0400)
committerThomas Berezansky <tsbere@mvlc.org>
Wed, 25 May 2011 02:12:46 +0000 (22:12 -0400)

Trivial merge