merge of '3909823d7e734624024ded918662eef22f0cef8c'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 13 Jun 2007 15:17:11 +0000 (15:17 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 13 Jun 2007 15:17:11 +0000 (15:17 +0000)
     and 'fd3a89f2fd02c28870688a4bbd8c014a2fdfca9c'


Trivial merge