merge of '1458e9ca6c6d9b78bff4114c4a3b09c7aa6b7a8e'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 11 Mar 2008 13:48:44 +0000 (13:48 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 11 Mar 2008 13:48:44 +0000 (13:48 +0000)
     and 'df907de16e9f058a9d98b4ee458c93e7c4965a9c'


Trivial merge