merge of '9b66131716d3b26195fe8531dce88f391ccc6e71'
authorShane Volpe <shanevolpe@gmail.com>
Mon, 24 Sep 2007 21:27:51 +0000 (21:27 +0000)
committerShane Volpe <shanevolpe@gmail.com>
Mon, 24 Sep 2007 21:27:51 +0000 (21:27 +0000)
     and 'ff7e7d4bb2ece720e10b5eaaf5077d02989f8246'


Trivial merge