merge of '7dc2fd459da1e96fc61fd1b7bc439f0282c91306'
authorPaul Sokolovsky <pmiscml@gmail.com>
Sun, 19 Nov 2006 02:30:21 +0000 (02:30 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Sun, 19 Nov 2006 02:30:21 +0000 (02:30 +0000)
     and 'e853ab6b84bda472e6268c922f1ac797be81351c'


Trivial merge