merge of '09677f41336b5e88788fbe514da56769201c3f97'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Aug 2008 02:01:32 +0000 (02:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Aug 2008 02:01:32 +0000 (02:01 +0000)
     and '66aff167a4c474e8997a21151c9dc6765365053e'


Trivial merge