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)
commitf3630ccede2047ba388d7b930f40c1c2d840cf4c
tree78a86b0c45cde64c1fa232479994e118b267a5a0
parent1bcc930ec17ed96e7c55aa925af6dfa367ebc2c0
parent9d2c0ba54d5651f689f912e5fa38a6db863fa198
merge of 3a0a7021e4d48fa98ec14249578b13b3e3cc4489
     and a1193f39f1f86aa55534e0c45b3dd46b8756d8be