merge of '06df0f40b1d36f22a5e9a1ddc32dbed08ea25373'
authorKoen Kooi <koen@openembedded.org>
Sat, 20 Sep 2008 11:54:00 +0000 (11:54 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 20 Sep 2008 11:54:00 +0000 (11:54 +0000)
commit90e8091ac40331f518fd1865692dd412ab8d240c
treea13a1412d80009d0b91eb765eb9784a0c6b4fb3b
parentc8085c31015f808e6c374989377147296db48527
parenta5610f6fc47c582e43f32896ac9a82d4113a2ac9
Merge ... '06df0f40b1d36f22a5e9a1ddc32dbed08ea25373'
     and '549d74d276248489dc6922e55359e9b25d94f07c'