Merge branch 'SIP23738' of git://git.mvlcstaff.org/jason/ILS into SIP23738
authorMike Rylander <mrylander@gmail.com>
Mon, 16 May 2011 14:24:07 +0000 (10:24 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 16 May 2011 14:24:07 +0000 (10:24 -0400)

Trivial merge