merge of 'c9d129a39ce3a34bfb785b028a0bb8d75802177f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 30 May 2007 14:29:10 +0000 (14:29 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 30 May 2007 14:29:10 +0000 (14:29 +0000)
commit0f9536cee661c42858765c7c366342ea5a99cd27
treedb74d2f370b097056a17cb835bf1c17b4999ba7e
parentc339f4d93da370a1facd20dd6a8b84f1a531b3a0
parenta5e439a14b77b183e154ebda73b9ff9420a137de
Merge ... 'c9d129a39ce3a34bfb785b028a0bb8d75802177f'
     and 'e15bb626d25464e032217adcaacd8578e8cecb65'