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

Trivial merge