merge of 'a806799c0a139d4eae90d21ae8b860b247eb47a3'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 30 Jun 2007 15:55:45 +0000 (15:55 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 30 Jun 2007 15:55:45 +0000 (15:55 +0000)
     and 'b3615d69f6416b196ef0183e2864d4289292a007'


Trivial merge