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)
     and 'e15bb626d25464e032217adcaacd8578e8cecb65'


Trivial merge