merge of '28c6631c48492003a3883657f53019459fbef9c4'
authorKoen Kooi <koen@openembedded.org>
Mon, 14 Aug 2006 13:41:42 +0000 (13:41 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 14 Aug 2006 13:41:42 +0000 (13:41 +0000)
commit998bbcda69e15712ed4dd98234232c7ba374c834
tree5f3a2b5e8fd82037c715223546f28bd71fc0a7bf
parent66ebbdb0941241711cd640bd0346c739f8115aa1
parent323cbe64c6ee2316245f3934ecbc1c483b94242b
Merge ... '28c6631c48492003a3883657f53019459fbef9c4'
     and '755927ccacd770940509d76e9f311b208d090874'