merge of '6f820aa47b2adf3dabcea3acc51e15b7eae933ef'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 Feb 2007 13:13:35 +0000 (13:13 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 Feb 2007 13:13:35 +0000 (13:13 +0000)
     and '760aa4900b6222376d10756436dd82ffe1ade2fa'


Trivial merge