merge of '06fb345943334f939a5210e3a0e3c6d4edf0e6c1'
authorKoen Kooi <koen@openembedded.org>
Thu, 30 Aug 2007 12:51:14 +0000 (12:51 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 30 Aug 2007 12:51:14 +0000 (12:51 +0000)
commit634f80151cba377aedff02a302f44eaa5b52af7c
tree5e3b33ef0225a7623d5716e30095ffb3951ee523
parent0b15697d7674074f1a5806518ff2d9b6c61f7877
parentde372333d013c8cf7674c9032a16d29b92f0a7b9
Merge ... '06fb345943334f939a5210e3a0e3c6d4edf0e6c1'
     and 'f4febba2a3678a4948cda4320c543ed34a41ff68'