merge of '4306fcec612a965372ade12eb91d17331cb56bb4'
authorPaul Sokolovsky <pmiscml@gmail.com>
Mon, 14 Jan 2008 20:47:25 +0000 (20:47 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Mon, 14 Jan 2008 20:47:25 +0000 (20:47 +0000)
     and 'cc81b55dbf5b140921173105fea309d7f2b15dd6'


Trivial merge