merge of '7f8a459602c5a9e1620039b224b4a804e3bbd8c7'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Dec 2006 19:52:42 +0000 (19:52 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 29 Dec 2006 19:52:42 +0000 (19:52 +0000)
     and 'f18e293bd173fb8bf032fa1f8dde46bb411bce56'


Trivial merge