merge of '0d78ba13efa94c8dc9d73148ac765d2208977709'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 13 Jul 2007 01:48:50 +0000 (01:48 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 13 Jul 2007 01:48:50 +0000 (01:48 +0000)
     and 'd7f27bd501e6a8e1fa4cce2a6e67d50bea43e8b7'


Trivial merge