Merge branch 'SIP23738' of git://git.mvlcstaff.org/jason/ILS into SIP23738
authorMike Rylander <mrylander@gmail.com>
Fri, 13 May 2011 17:24:36 +0000 (13:24 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 13 May 2011 17:24:36 +0000 (13:24 -0400)

Trivial merge