Merge branch 'trunk' of git://git.mvlcstaff.org/tsbere/ILS into installer
authorThomas Berezansky <tsbere@mvlc.org>
Fri, 18 Mar 2011 17:19:29 +0000 (13:19 -0400)
committerThomas Berezansky <tsbere@mvlc.org>
Fri, 18 Mar 2011 17:19:29 +0000 (13:19 -0400)

Trivial merge