merge of 'da208288712062005c17d9f4b6bea22ac67c9152'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 22 Nov 2007 17:20:55 +0000 (17:20 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 22 Nov 2007 17:20:55 +0000 (17:20 +0000)
     and 'fbf68cc9245c99890a7243d02341cbd6840ac6b9'


Trivial merge