merge of '387fe9ed0ed82ea68e96a75f8876fe0807a070cd'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 7 Dec 2007 21:19:08 +0000 (21:19 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 7 Dec 2007 21:19:08 +0000 (21:19 +0000)
     and 'd3ec22c2f56bfe13ae582b6c4495224757d4a0c7'


Trivial merge