merge of '13364d2be993b3a7913d2159c9b8514e52893b4a'
authorKoen Kooi <koen@openembedded.org>
Sat, 7 Apr 2007 20:50:28 +0000 (20:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 7 Apr 2007 20:50:28 +0000 (20:50 +0000)
commit825674e5fc178a9a7f0becfa7b6ebf71a5106023
tree92a0a5bb14f9b7dcee6fa81984b19075382919db
parenta1373ee9a893b361753867311fcd20499a27a22b
parent2f686abfb589f707a33a10ca33f33a46891c803b
Merge ... '13364d2be993b3a7913d2159c9b8514e52893b4a'
     and '185ce7e23b283d430a101c7e4df3f38562a67271'