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

Trivial merge