merge of '085fdb053bd524c93d21f1f230ab0b9ae7e0143f'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 10 Jan 2007 14:18:19 +0000 (14:18 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 10 Jan 2007 14:18:19 +0000 (14:18 +0000)
     and 'a0e35a653641856b7a032c32949f7d3b2c23b5af'


Trivial merge