merge of '33643184403d6444039a75b310bad85488126b9c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 16 Aug 2008 13:01:40 +0000 (13:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 16 Aug 2008 13:01:40 +0000 (13:01 +0000)
     and 'f42614d85ff9d52577c1148c8d8b6445ec2909e4'


Trivial merge