Merge branch 'master' of git://git.mvlcstaff.org/tsbere/ILS into installer
authorThomas Berezansky <tsbere@mvlc.org>
Sat, 14 May 2011 22:23:30 +0000 (18:23 -0400)
committerThomas Berezansky <tsbere@mvlc.org>
Sat, 14 May 2011 22:23:30 +0000 (18:23 -0400)

Trivial merge