Merge branch 'master' of git://git.mvlcstaff.org/tsbere/ILS into mdp-improve
authorThomas Berezansky <tsbere@mvlc.org>
Wed, 25 May 2011 01:53:26 +0000 (21:53 -0400)
committerThomas Berezansky <tsbere@mvlc.org>
Wed, 25 May 2011 01:53:26 +0000 (21:53 -0400)

Trivial merge