merge of '05d362f21194531a4bd536d49201b248b03d4622'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 2 Nov 2006 02:35:04 +0000 (02:35 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 2 Nov 2006 02:35:04 +0000 (02:35 +0000)
     and '5cbc39050c26beb697a316f56d4de59c5783a3cf'


Trivial merge