merge of '3021686956bdcf5b95480557bdd87b8892e303a8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 Nov 2007 13:50:07 +0000 (13:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 Nov 2007 13:50:07 +0000 (13:50 +0000)
     and 'a1d56e481ec69ff77b7fdd13cc367cb58d64396e'


Trivial merge