merge of '5a1eeba70ddedb225afa7bcf6a948e3d1e376069'
authorShane Volpe <shanevolpe@gmail.com>
Tue, 19 Aug 2008 16:33:40 +0000 (16:33 +0000)
committerShane Volpe <shanevolpe@gmail.com>
Tue, 19 Aug 2008 16:33:40 +0000 (16:33 +0000)
     and '73007fe3d4a6a4798e007ad2a1106b860e763c07'


Trivial merge