merge of '62840d70a6509ba3585a883b01fcbdd249f064ed'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 19 Oct 2007 11:30:58 +0000 (11:30 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 19 Oct 2007 11:30:58 +0000 (11:30 +0000)
     and '83f11f55f23096e3345625ae476f2ba29676420b'


Trivial merge