merge of 4cc4648923ad8444dbe849ae4489ed6dbc605c47
authorHolger Freyther <zecke@selfish.org>
Sat, 10 Sep 2005 20:44:37 +0000 (20:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Sep 2005 20:44:37 +0000 (20:44 +0000)
commit56a690e70b1b767625bd7aa2ed5cda4371889530
treed29b8e6522ec69f7f79fe99dfea0c1aaff9378f4
parent40f7b30d94d1cb2fc88ae6f905bb5fa0c39314c3
parenta111cc3c8c8b3bc395afd489c316c7f6097ba40d
merge of 4cc4648923ad8444dbe849ae4489ed6dbc605c47
     and b3eb9fb1e603dc46b493a195f8c6a4cb9a0a13e3