merge of '5e862ccc5f65ba4b2947b0c3a5c0f84596b9fd8f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Dec 2007 11:52:03 +0000 (11:52 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Dec 2007 11:52:03 +0000 (11:52 +0000)
commite53010f3e23696686db59c24b60cd237c5bec6aa
treecb374b391ba94fbd82e7d347364d483a35857e21
parentb8ff4dd3169fb27b4ab314177fa2dc761d3d68ea
parent3f8e414430a57ed61786de2c4e15fc579f2955a5
Merge ... '5e862ccc5f65ba4b2947b0c3a5c0f84596b9fd8f'
     and 'b9d72c3b2667d036ca41078c8c8f39cdccf8ee69'