merge of '069cb75cc86b7dc6009c903b63cddcb884858210'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 16 Feb 2007 10:31:11 +0000 (10:31 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 16 Feb 2007 10:31:11 +0000 (10:31 +0000)
     and 'b21fcc2294b39029891cdcf3c5efac9106f179e6'


Trivial merge