merge of '320cd49f6ce7994ee9c34b9b23d6c3feaf3889fc'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 11 Dec 2007 20:58:28 +0000 (20:58 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 11 Dec 2007 20:58:28 +0000 (20:58 +0000)
     and '43dea0134aceb7d9e9b13bdaf025552aeef1fa64'


Trivial merge