merge of 3a5832d4912a64e85b05315eb3993311efbecb59
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Jul 2006 14:41:07 +0000 (14:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Jul 2006 14:41:07 +0000 (14:41 +0000)
commit51a75bba4fdaf12f51acc4823cdc86eb3efc0c06
tree7419571f30e0f912b1878992c2ede5d490347782
parent6bb2cb76ad6545355dd8aa363d7dc420fb8b1afe
parentd3589f03e38c55960d7e4ffc0e1928a38e8b02f4
merge of 3a5832d4912a64e85b05315eb3993311efbecb59
     and f98077b2233306af226b7ac750bc1184a00e83f3