merge of '471af30b8adb13fb7681f57fbf429fee02749677'
authorKoen Kooi <koen@openembedded.org>
Fri, 16 Feb 2007 11:57:17 +0000 (11:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 16 Feb 2007 11:57:17 +0000 (11:57 +0000)
commit277af2f09d9b9c8f18a0b159e1d0d03f104df6c6
tree47086952bc453a26cb9a8bc8596f57b35b730ebb
parent9cd040773b73fef2dbcad2a9b5e07c784065074c
parent8ac98dee22a516f221971c051de11681618dbebb
Merge ... '471af30b8adb13fb7681f57fbf429fee02749677'
     and 'c75dc8320db6dd7f35c858791b148fbb1200f82c'