merge of cea2e905efcc547c29cbeeb5cf1c21624a03e1d7
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 20 Nov 2005 15:18:07 +0000 (15:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 20 Nov 2005 15:18:07 +0000 (15:18 +0000)
     and f509d4ebf8cfb02c949619f5b86db39e811df524


Trivial merge