Merge branch 'trunk' of git://git.mvlcstaff.org/tsbere/ILS into installer
authorThomas Berezansky <tsbere@mvlc.org>
Wed, 20 Apr 2011 18:03:20 +0000 (14:03 -0400)
committerThomas Berezansky <tsbere@mvlc.org>
Wed, 20 Apr 2011 18:03:20 +0000 (14:03 -0400)

Trivial merge