merge of '3435cb21c55c108634fdf3ba4be7058e232b933c'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 22 Dec 2007 19:10:53 +0000 (19:10 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 22 Dec 2007 19:10:53 +0000 (19:10 +0000)
     and 'f10873191494c17f5e3cc0b9dd10205d4614265a'


Trivial merge