merge of '0604b4d21148fa75a4b643461eb52fd689ac43c2'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 10 Jan 2007 15:08:35 +0000 (15:08 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 10 Jan 2007 15:08:35 +0000 (15:08 +0000)
     and 'dd2c41928ef5fc90d06676100aedb5fc3d716efa'


Trivial merge