merge of '95bb7c56fa20da5b09bb4a569a012dff600c92ea'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 6 Jun 2007 21:50:12 +0000 (21:50 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 6 Jun 2007 21:50:12 +0000 (21:50 +0000)
     and 'de933998bda080807ad9ffbe3da30f7880f2644f'


Trivial merge