merge of '400e309c08a8818180ce9e6440f4695a898cdf83'
authorKoen Kooi <koen@openembedded.org>
Wed, 7 Feb 2007 19:51:14 +0000 (19:51 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 7 Feb 2007 19:51:14 +0000 (19:51 +0000)
commit2d5b708058f50922ab9af2735b3d21281f3d2d73
tree62f8ae825dc02ed4dbea21a6675bdda871742edb
parent61507ca7d6b3b629c6eb3ede1a9a01a08407f2cb
parent92f1049b080402154265defeddc869bb726cb0cc
Merge ... '400e309c08a8818180ce9e6440f4695a898cdf83'
     and '918e51dad50cec492dd6963b204ad643f9ec7f35'