merge of 01c1850873f10c350058c1f27c3c2f03fc450a29
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 20 May 2006 12:08:21 +0000 (12:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 May 2006 12:08:21 +0000 (12:08 +0000)
     and aca2e92b4aa01fa7f5bb94eede89c3e395a5c5e9


Trivial merge