merge of '6309cf36af0ed6f2ac28bdcced53772af7def480'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Jan 2007 06:57:01 +0000 (06:57 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 7 Jan 2007 06:57:01 +0000 (06:57 +0000)
     and '9ae064401d877caf8963191902b07d4460f8ed68'


Trivial merge