merge of '99fe2559bc0e5cf2850f8d44dd60d8b7d5e09756'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 10 Nov 2007 22:56:17 +0000 (22:56 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 10 Nov 2007 22:56:17 +0000 (22:56 +0000)
     and 'c1e310b63c858128195b8270be427146a86cbd75'


Trivial merge