merge of '3c71db502f1f99ac9b5d9e0ab928273904283f4f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Sep 2008 22:02:27 +0000 (22:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 Sep 2008 22:02:27 +0000 (22:02 +0000)
     and 'c2ccffcf8a360685e566eab3f870529066019228'


Trivial merge