merge of 70c6a809b479d2c6e6e5eaaffd412be3c60d71f3
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 18 Jan 2006 10:54:38 +0000 (10:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 18 Jan 2006 10:54:38 +0000 (10:54 +0000)
     and 9c6d2f9ed3be4745760b4dcd14811587f4acd623


Trivial merge