merge of '91bdb4f03e9136ce38f7fb48886cef202c6e144a'
authorPaul Sokolovsky <pmiscml@gmail.com>
Fri, 13 Oct 2006 17:25:42 +0000 (17:25 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Fri, 13 Oct 2006 17:25:42 +0000 (17:25 +0000)
     and 'b2c9193cbf484ae2d06df4ec7e483cad3c57741d'


Trivial merge