merge of '0cb718c4b71b8cd025b681dd7861a927c49006f9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 10 Feb 2008 03:30:16 +0000 (03:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 10 Feb 2008 03:30:16 +0000 (03:30 +0000)
     and '678aafb268a6d6220e4ccfcf905231ac20a5b722'


Trivial merge