merge of '6834c8854d34a28405ba69e170089d3a873e3d1a'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 19 Dec 2007 01:54:55 +0000 (01:54 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 19 Dec 2007 01:54:55 +0000 (01:54 +0000)
     and 'a7d1cc5d7de3e065c4500946dd7be51aa6bbc83f'


Trivial merge