merge of '33a1439ed0925b6fdb7b29081cfb7c2481aebdd3'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 29 Mar 2007 13:10:58 +0000 (13:10 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 29 Mar 2007 13:10:58 +0000 (13:10 +0000)
     and 'c3806da7db88d5cd14b6cc7ed62c575f1269f6d4'


Trivial merge