merge of 'bb4d307be1e1e6c7dcfacbb22b9b3a37de4f3a80'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 3 May 2007 21:54:34 +0000 (21:54 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 3 May 2007 21:54:34 +0000 (21:54 +0000)
     and 'd8cede683cb063194640417f9789761e2613100f'


Trivial merge