merge of '4debfc11cf9e85b98e7395e221cb5044cf8fe49d'
authorKoen Kooi <koen@openembedded.org>
Wed, 5 Dec 2007 08:30:47 +0000 (08:30 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 5 Dec 2007 08:30:47 +0000 (08:30 +0000)
commit84e45797efabaf9db490763f312a1dab888bdb2e
tree6e7e31c4e43f2cd6688a91e3264876cc748dfb7f
parent736650b5924b5c1ce37512ae98a836a50acf0d6a
parent47f7874773e9daa0ed579e907a47c39c8a032baa
Merge ... '4debfc11cf9e85b98e7395e221cb5044cf8fe49d'
     and '7e45814ce1cb1ed4bb79fe646a4a5546cfa6a5e2'