merge of '48f6d095cfa6525db4c539a3ac145ee322be60af'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Jul 2008 15:17:25 +0000 (15:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Jul 2008 15:17:25 +0000 (15:17 +0000)
     and '83a3842e481b7407e271aa8542f64c8eea36f71f'


Trivial merge