merge of 'ae58c86232faa6dff1def818171d1a4540ab26c1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 26 Aug 2008 12:09:03 +0000 (12:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 26 Aug 2008 12:09:03 +0000 (12:09 +0000)
     and 'e8b175e5c49f7b2d278c5af101606854e56d7a32'


Trivial merge