merge of '76afa3fd7e5ab1e782da555eb4e4d888551a37c6'
authorKoen Kooi <koen@openembedded.org>
Sat, 20 Oct 2007 15:48:20 +0000 (15:48 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 20 Oct 2007 15:48:20 +0000 (15:48 +0000)
commit5d1a88a02aef8574d73d0a725e1df65d0549a83b
tree0ab7bc35c4b2db72b4e213cd0951adf4535bd335
parentb5bfd7f1fd6bd34ef51701e918b40f724cb46258
parent1466348a03b6af7034ca91618a74a33e5665540b
Merge ... '76afa3fd7e5ab1e782da555eb4e4d888551a37c6'
     and 'fe4e349c9f99ffcc18a5abe8041cd3379219c456'