merge of '8c180cdd04353fb978ee80dd7f8d89c386348b4a'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 16 Oct 2006 13:49:55 +0000 (13:49 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 16 Oct 2006 13:49:55 +0000 (13:49 +0000)
     and 'a3e2c882275282c396dfac0da94e320d46e521f2'


Trivial merge