merge of '0c8907e0f2b5bf5a3285e92be17c709e5d0ffa79'
authorKoen Kooi <koen@openembedded.org>
Wed, 17 Oct 2007 13:29:32 +0000 (13:29 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 17 Oct 2007 13:29:32 +0000 (13:29 +0000)
commit72a99a8872c4afe0b53ad760c2c9ca63de9f0e7f
tree2d2de4ae847eedae32a78a34c504954f6529a46a
parent162930b4adb978a06d6ca2a918e6d91e5112f010
parenteeedcd7cd3db7a3aa84364f199751d8c1ae08863
Merge ... '0c8907e0f2b5bf5a3285e92be17c709e5d0ffa79'
     and '908d37bd47fa2dc11cfb3cb7a8925330fbf6163d'