merge of '7d29a133a6a1c4f38122eaea121aa044b235decb'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Oct 2007 00:15:19 +0000 (00:15 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Oct 2007 00:15:19 +0000 (00:15 +0000)
     and '957515946d267e12f3a5a1581ab70a1450789f2c'


Trivial merge