merge of 'eb6e4d15da4869e43ebb82d8af41337197ec07aa'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 16 Oct 2006 14:26:10 +0000 (14:26 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 16 Oct 2006 14:26:10 +0000 (14:26 +0000)
     and 'fccbe41e2f2262778c4c35c42152820a8d093b35'


Trivial merge