merge of '7c68840f9e61bf1b24bfe84c80958a929056fec3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Oct 2007 11:40:52 +0000 (11:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Oct 2007 11:40:52 +0000 (11:40 +0000)
     and '96b052b9c5046dbbfa151a054726f9e9b67d7e7e'


Trivial merge