merge of '9e8fa08e687f308e46230b3b21322dd836444437'
authorKoen Kooi <koen@openembedded.org>
Mon, 29 Sep 2008 18:16:10 +0000 (18:16 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 29 Sep 2008 18:16:10 +0000 (18:16 +0000)
commitb1ac6f2c8b622b77ffb3af413ee4a76e08542364
tree14c79efa9aa019a112faca64814bc0f05f239fb9
parent613ea500ccd154a68a33943aaf47dfe6db53d375
parent1299d049755258320459e4fa15aa745e4439a8b9
Merge ... '9e8fa08e687f308e46230b3b21322dd836444437'
     and 'f7dc745c5616c2ded1ef5a622a2de0fa80bb03ad'