merge of '64e4141742ce7b9bb873c115920491a60d6fd60d'
authorKoen Kooi <koen@openembedded.org>
Wed, 13 Jun 2007 10:31:22 +0000 (10:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 13 Jun 2007 10:31:22 +0000 (10:31 +0000)
commit5a1de9dce06cec3b38de01f8f1108a6bcf4685ca
tree98484cde49829ab779dfd48d6ed4c034eea8bee8
parent28ca62fc66a15d032257ad50ee0540b6eb3e5eaa
parent17e73f44c043e98722fb0220457cbc845b95fc37
Merge ... '64e4141742ce7b9bb873c115920491a60d6fd60d'
     and 'df4c815de2b1a6e7b275ed3aa47c0dd906e8001d'