merge of 'ba1cabe56e69c8589c61e7c884217cc75f950877'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 2 May 2007 15:18:30 +0000 (15:18 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 2 May 2007 15:18:30 +0000 (15:18 +0000)
     and 'c3acd01a05c3a6ed64990e92ec184f98594b2bf5'


Trivial merge