merge of 'a806a9f3048bf953ea29faffb714688ab1a8d4d8'
authorKoen Kooi <koen@openembedded.org>
Wed, 3 Oct 2007 12:38:36 +0000 (12:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 3 Oct 2007 12:38:36 +0000 (12:38 +0000)
commitca1d32f37e5515d92572ddeb03d594b8cb132060
treec81f901cbc8afba251cc9692bf2f4011b35cfa34
parentf71ba113eb283d7a60002dc6425b1f4c77429c28
parentcfa978e9df15508e69c4c363284c689d922da2da
Merge ... 'a806a9f3048bf953ea29faffb714688ab1a8d4d8'
     and 'b197b98e05323ddd6e2f04f723ec87f58fe81d3b'