merge of 0aa8df480a5fe2c0daeaff3c39171cce7fde6a4a
authorMatthias Hentges <oe@hentges.net>
Fri, 26 May 2006 09:25:34 +0000 (09:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 May 2006 09:25:34 +0000 (09:25 +0000)
commit1ab658bccabfdb1792e966c6725fc2496ffbb3f9
treeaf6d2a3be1215bfef63a07d41d1f0b9883b5706b
parentaecccaefd0a9a119f444e77fe0e52bd690f81961
parentd0487e1763471b2ceda3e4aa7c246a1d7ce114c4
merge of 0aa8df480a5fe2c0daeaff3c39171cce7fde6a4a
     and cbe9e2ec3566ef5af4fa806a0faec1ddf3984cd4