merge of 7bd820c4a7bbdcb47264fd60a48b7099177d4859
authorMichael Lauer <mickey@vanille-media.de>
Wed, 12 Jul 2006 12:04:36 +0000 (12:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Jul 2006 12:04:36 +0000 (12:04 +0000)
commit2e09a46a5d8a9f4cc55ff3b7776f59158ccd87bf
treeea3653cac845dc20345bc4241087fdf287413707
parent646d5d88ea378aaafe8cf7d8d09ae67bb1997892
parent8d5f1db39c2730fdf1bd6b46e47dd480d86d19b7
merge of 7bd820c4a7bbdcb47264fd60a48b7099177d4859
     and 87830c48ea8ea7120ce229524f7ab20d869b1e31