merge of '662671acd71fe1d35ae40225df2ec7c130b09f78'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 4 Jan 2008 00:12:32 +0000 (00:12 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 4 Jan 2008 00:12:32 +0000 (00:12 +0000)
     and '912468215c017fe786e40c9ee8de03bb61484993'


Trivial merge