merge of '0e7dafd4ba684994da9cbab0292dbd6e3c6be3ec'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 18 Jan 2008 15:14:24 +0000 (15:14 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 18 Jan 2008 15:14:24 +0000 (15:14 +0000)
     and 'cc72cefccea1756ea052a54b2ec73e0ef6e3d9eb'


Trivial merge