merge of '13f416a3e05817d30ce02ebb401beb3b6fc96436'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 30 Jun 2007 16:43:40 +0000 (16:43 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 30 Jun 2007 16:43:40 +0000 (16:43 +0000)
     and '3d5a36c3240f35b2c187753423b65752b6676f55'


Trivial merge