merge of '540ebc99010568ee45c73efb2febc13a9df00288'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 28 Apr 2007 23:19:12 +0000 (23:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 28 Apr 2007 23:19:12 +0000 (23:19 +0000)
     and 'aaea0467de32876d1094521c446e1e04f7d79c7f'


Trivial merge