merge of 03fd4d06deb0ac1de761650c03d3b56f3d217c49
authorMatthias Hentges <oe@hentges.net>
Sat, 20 May 2006 08:54:31 +0000 (08:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 May 2006 08:54:31 +0000 (08:54 +0000)
commit229b799c419f274c7aa3fc537f1cc74d291aaf0f
tree46439a90f3f7a9dce12f6f094bf7e9e94c0cdfa6
parentc2420f459bde3d91cc8fc4b585e1ba49edb858f0
parentdbbc6b98af8ec9dcd32094f48198f37acb9ef916
merge of 03fd4d06deb0ac1de761650c03d3b56f3d217c49
     and 46c1cdea7bf65d8ba6bbe951e7408d24d5b05d06