merge of b2aabdd1853c4273f9ce3ab3d26acd034460ec1c
authorMichael Lauer <mickey@vanille-media.de>
Sun, 16 Apr 2006 14:40:35 +0000 (14:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Apr 2006 14:40:35 +0000 (14:40 +0000)
commitb401918bd78e60ad141176d87b452440ae1f3050
treeac25f5ad2495b821711455a22b5f6ef16a55e8ca
parent8214d1b3697b5204f314e02e762396dd27bf30a8
parent256e671e1944961ca4e19c13684cec34da1966bf
merge of b2aabdd1853c4273f9ce3ab3d26acd034460ec1c
     and dcff2c4c5128ab25e2593ca84778d2a405fb7cb3