merge of '43b7d311b8108ccaa97f5955ea74f245fe291dc0'
authorKoen Kooi <koen@openembedded.org>
Tue, 5 Aug 2008 15:56:54 +0000 (15:56 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 5 Aug 2008 15:56:54 +0000 (15:56 +0000)
commit795f228d21be86982bfeae49b9d94031ee7284f3
tree36270a713183ddf9d37f0a5b898678bbf2d18023
parent8837010e37002e999299a6cb4ee8d8486b0f420d
parent3422a436880509c7f82a3ae5d5693c87ece7a42d
Merge ... '43b7d311b8108ccaa97f5955ea74f245fe291dc0'
     and 'beea20d8bd60f3598225741e5395f689cd57bdf1'