merge of 'a41270f197c19482f466d5e12850e9c76c7358b5'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 26 Oct 2007 14:48:57 +0000 (14:48 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 26 Oct 2007 14:48:57 +0000 (14:48 +0000)
     and 'f3edd5c73b71cef16fcff1594f21d2d1af16cf3a'


Trivial merge