merge of '425d05a68460efe35fd3aa32789666be49ecd3cf'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 16 Oct 2006 13:44:45 +0000 (13:44 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 16 Oct 2006 13:44:45 +0000 (13:44 +0000)
     and 'c1c58152e12d208c30b3e36b988116eaf94ba68e'


Trivial merge