merge of '5353be39ab2ea320be019c163381f5d3e4cadc2b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 3 Dec 2006 15:20:57 +0000 (15:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 3 Dec 2006 15:20:57 +0000 (15:20 +0000)
commit67e57a6c42edb0efeca765cb913748f292732457
treece99e0ba9796c731dcec8d0d0fb516842d20457e
parent99880124e148b73cb1f6183c8b3100c3bdaebd70
parentacfb7d8bb9d2c2d22232e75836d563f02c2aca6f
Merge ... '5353be39ab2ea320be019c163381f5d3e4cadc2b'
     and '773bfc8eb4142f3291c08d0ea2f313be1f93d7a4'