merge of '716f98fce0ebdab4efc34d2d51dc1ba58a4ead3d'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sat, 30 Jun 2007 18:02:04 +0000 (18:02 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sat, 30 Jun 2007 18:02:04 +0000 (18:02 +0000)
     and '98d02c14c4d2e08f3fe03f716c9fa5b128b351a4'


Trivial merge