merge of 5b9f262d058d326dc272b37c6613728556effa9c
authorMichael Lauer <mickey@vanille-media.de>
Thu, 11 Aug 2005 20:45:15 +0000 (20:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 Aug 2005 20:45:15 +0000 (20:45 +0000)
commit99b6de60ddd9dad6171a756023ca0170e4c050ea
tree94cc86af3ad8f3d7d8a43c45653c12611d00fd33
parent4482fb65c15c522245c9fed2ed92bc182fb2304c
parent095451a6723c920af3d1f64c88532c60a477292c
merge of 5b9f262d058d326dc272b37c6613728556effa9c
     and f4976c9f1b5d682c92d9f4241affb718217f1074