merge of '60f2ec6da106ffdd1d5ac217c5babe90afcd7ed1'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 17 Jul 2007 14:42:10 +0000 (14:42 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 17 Jul 2007 14:42:10 +0000 (14:42 +0000)
     and 'd38e77f8e1f1342a98a7f8357ef649d8041bea07'


Trivial merge