merge of 'bca233c54921d697afe0c58539ba0647975eea82'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 28 May 2007 20:58:26 +0000 (20:58 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 28 May 2007 20:58:26 +0000 (20:58 +0000)
     and 'c3ea902a16ac9537aff32973f0af8e547cc765ba'


Trivial merge