merge of 5df1387cd8c625374e63d4615c0507cf6c6a45c0
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 15 Nov 2005 17:39:25 +0000 (17:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Nov 2005 17:39:25 +0000 (17:39 +0000)
commitf6cb11d26ea5ee3cb9f6b4b43d7fbb304f4ab290
tree05aaddaec0fa2621a608fdfa712634c10b57d29d
parent7de998bd4b1d2417fc4702756668da58bdb977bd
parent4286db436abc35781c830a23c51e070bf795ca41
merge of 5df1387cd8c625374e63d4615c0507cf6c6a45c0
     and 8a31a000a664d200e8aaa578c071fb1bf2664eb2