merge of '56d2135bf97d27ef385220e2f6f36071d007d2c1'
authorKoen Kooi <koen@openembedded.org>
Fri, 19 Sep 2008 08:02:16 +0000 (08:02 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 19 Sep 2008 08:02:16 +0000 (08:02 +0000)
commit51c333eb8d88a4aaf8926aeaaeab7a3f1cd26588
tree5423324d2573a37a73f91121c8fc460b9afa8da3
parenteaabdabd762138f056f347020df8717003887584
parent2ea132f7f1a3206f7593cb33b0364b27ece00ab4
Merge ... '56d2135bf97d27ef385220e2f6f36071d007d2c1'
     and '93613724e08c89b20a49d8619284f2f1ee5f7898'