merge of 'a2a370156f2400ca17a230cf084e20d1aec57d83'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Sep 2007 10:25:04 +0000 (10:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Sep 2007 10:25:04 +0000 (10:25 +0000)
     and 'e4201f3c5efef702c8a5f6804a394e9e3304e1cc'


Trivial merge