merge of '45fb4fa94d52a65c3a3fa636c6122139173dfa8d'
authorKoen Kooi <koen@openembedded.org>
Tue, 12 Dec 2006 20:27:47 +0000 (20:27 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 12 Dec 2006 20:27:47 +0000 (20:27 +0000)
commit44fd0a5b1ae5367de691e3437ae9832d800c22e7
tree109ae8782937b1d768db72b56496fe921bc912d4
parent33a1e2e14f1d92a015887d13ff228e2771573683
parent3eda560ee66482cb9954d538b5c2743942dda260
Merge ... '45fb4fa94d52a65c3a3fa636c6122139173dfa8d'
     and 'aa6010d679e0e80d63f4e63191b66e5759482858'