merge of '25f6ad493ba862d73422f5468f734f72840fa6af'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 10 Mar 2007 14:18:01 +0000 (14:18 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 10 Mar 2007 14:18:01 +0000 (14:18 +0000)
     and '7b2d2094f68ede9c9d5e10c5722472d35573e9b1'


Trivial merge