merge of '0f6a05ae6a2dd058bfe88bed97e9d6530e5c9395'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 25 Dec 2007 18:18:32 +0000 (18:18 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 25 Dec 2007 18:18:32 +0000 (18:18 +0000)
     and 'a2db4317a6940d3a7ea74bc07545523686942a59'


Trivial merge