merge of '02f0d5fddf858a7c968f6aa8a0733e64c373840d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 20:31:29 +0000 (20:31 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Dec 2006 20:31:29 +0000 (20:31 +0000)
     and '8b3597c2174798b0e22b0c752ade70a447dd991a'


Trivial merge