merge of '8ccc9ddeffbeea9f755fb4b0caf0a811f8221384'
authorKoen Kooi <koen@openembedded.org>
Wed, 23 Aug 2006 21:45:11 +0000 (21:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 23 Aug 2006 21:45:11 +0000 (21:45 +0000)
commit14910a6560718b83bc0dbe1eba8bf885d2928ac1
tree32e7f9da7854c4e72e414d427dfbe67e9056b898
parent68be6099dd326f7e48422cf3cacab6433b360260
parent8b63540334b750df47c88510ca19662b35d0e16e
Merge ... '8ccc9ddeffbeea9f755fb4b0caf0a811f8221384'
     and 'c9f0e213d8e0fdc01e39c1d5ebd4f3e5de4db6b1'