merge of 'd6b23e81759fb2972944b275544f4969ce3412cc'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 13 Sep 2007 09:27:35 +0000 (09:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 13 Sep 2007 09:27:35 +0000 (09:27 +0000)
     and 'f9a3a066f3fa746520eb3fded9016d4f30951937'


Trivial merge