merge of ae422df79b5b9f0a401e9a4e9ae694ece441d33e
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 23 May 2006 09:02:18 +0000 (09:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 May 2006 09:02:18 +0000 (09:02 +0000)
     and f3fea5653b417f0d915e521ea668b6fbf17851df


Trivial merge