merge of 'b96176f68bd2545b7289726943c8c98746124533'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 16 Feb 2008 00:22:16 +0000 (00:22 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 16 Feb 2008 00:22:16 +0000 (00:22 +0000)
     and 'efa50d2f263b84fff5481de06517aac16a406c5d'


Trivial merge