merge of 3a0a7021e4d48fa98ec14249578b13b3e3cc4489
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 9 Jan 2006 19:49:29 +0000 (19:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 9 Jan 2006 19:49:29 +0000 (19:49 +0000)
     and a1193f39f1f86aa55534e0c45b3dd46b8756d8be


Trivial merge