merge of '846cac1d65f36e1abe1166e8c149a74192ad56e7'
authorKoen Kooi <koen@openembedded.org>
Fri, 11 May 2007 09:24:10 +0000 (09:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 11 May 2007 09:24:10 +0000 (09:24 +0000)
commit776bbf3da1ed47eee452b023d95aad99db7a3577
tree68df9ccdab841cd036bda04ed4976c1e3cffd2b1
parent9db9b26b27821528ef0b66bab5eb161011e0630b
parent06e66f309b67709c121c5105bf7feec6895674f1
Merge ... '846cac1d65f36e1abe1166e8c149a74192ad56e7'
     and 'd9ba9ec9ce6f5317b9b28dbd4e98e4cb52ecb6f6'