merge of '17f165259b5092d4fb5def6145d429af967f491a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Oct 2007 08:24:32 +0000 (08:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Oct 2007 08:24:32 +0000 (08:24 +0000)
     and '59cab1cf7e6555c78e83160548945b0b63b193a9'


Trivial merge