merge of '4ea1a0b7c2e8cc96e7303233217fd57efa3b1b5b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jul 2007 15:48:40 +0000 (15:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jul 2007 15:48:40 +0000 (15:48 +0000)
     and 'd1b0e1fcb5380bef0abd58faae2693512c88903c'


Trivial merge