merge of '4c8bd7ca61d815d94202feba1abab9c776a93350'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 26 Apr 2007 11:01:15 +0000 (11:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 26 Apr 2007 11:01:15 +0000 (11:01 +0000)
     and 'fc756d25fc999f6ac7951c0122c5beaa2f754e3c'


Trivial merge