merge of 'f48ac043926352f44cb734d06f001be6e51080ef'
authorKoen Kooi <koen@openembedded.org>
Tue, 9 Jan 2007 13:04:53 +0000 (13:04 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 9 Jan 2007 13:04:53 +0000 (13:04 +0000)
commit0b01f303107f553bb9c1125ee5e43c4774024aa2
tree64f424c4a6ffa92ea76cf35a701b0a934cec1435
parentfca0304f86c05d73e8586701963e36c69acb634e
parent8360c8e6611776f629781546e89432070f932fc7
Merge ... 'f48ac043926352f44cb734d06f001be6e51080ef'
     and 'fcd003eb4fa8060fd6075794e36115f1b96f4bf8'