merge of '96bd64db32828367264800d1cfdf956eff85cb26'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 26 Jun 2007 17:18:21 +0000 (17:18 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 26 Jun 2007 17:18:21 +0000 (17:18 +0000)
     and 'f0486ab90d9bcee9358419983d8574f60fbf94af'


Trivial merge