merge of '1cd9d41c23539a7485e834aa97be79cb802711e1'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 6 Feb 2008 13:08:10 +0000 (13:08 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 6 Feb 2008 13:08:10 +0000 (13:08 +0000)
     and '5b39dd5751765304c0257f1ce36b2fb246b5cbaa'


Trivial merge