merge of 'de732b9edab14596e25612f268a89373d0b775ab'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 21:19:29 +0000 (21:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 21:19:29 +0000 (21:19 +0000)
     and 'e09470e6a979b0419df41161d7a1b4e89fce5c79'


Trivial merge