merge of 'a06e8907f1fe04daf5997ead2a947bfbdc675a7c'
authorKoen Kooi <koen@openembedded.org>
Wed, 25 Jul 2007 10:19:45 +0000 (10:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 25 Jul 2007 10:19:45 +0000 (10:19 +0000)
commitb97b206fca43c75ac7098d358bf4c51cd3aed261
tree8a6083fee7f25373d29c85d1ec14cdbc08d8e7e7
parent9b7d152e6fd914b95c6559f16e0f302df2d70da5
parentfc798ce19aba645dfe0b29563e7f7e8c33ff01dc
Merge ... 'a06e8907f1fe04daf5997ead2a947bfbdc675a7c'
     and 'a86521780dc35dc231aed40133a626f55b4b3887'