merge of '45717dd378e89bf7ba418cac08db57a5e7a55474'
authorShane Volpe <shanevolpe@gmail.com>
Wed, 20 Aug 2008 03:17:14 +0000 (03:17 +0000)
committerShane Volpe <shanevolpe@gmail.com>
Wed, 20 Aug 2008 03:17:14 +0000 (03:17 +0000)
     and '89b3663402c864c49ce19e33bca2ae6a059b54f9'


Trivial merge