merge of '0366fffbef665b0cabc497886e24038bbc2a9a33'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Nov 2007 16:48:41 +0000 (16:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 Nov 2007 16:48:41 +0000 (16:48 +0000)
     and '479d13695983e03ab97dd5dc4227bdf7453ca63b'


Trivial merge