merge of '44169e43f3a99ef5c64767fe8bdd3b86ecf0d55a'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 9 Jan 2008 02:41:36 +0000 (02:41 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 9 Jan 2008 02:41:36 +0000 (02:41 +0000)
     and 'be5f46ae6a34db04f8dca3da7ad264ef4fc30e9e'


Trivial merge