merge of 477391c8fb10ffc2c9755224604d250af04156b6
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 14 Jan 2006 23:12:54 +0000 (23:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jan 2006 23:12:54 +0000 (23:12 +0000)
     and 694969a93c9959459359c6fb14c40eb9a47b0d2f


Trivial merge