merge of 'a49fe2e2da0e39e35809f715b1dcda205597a1ec'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 3 Aug 2007 09:02:54 +0000 (09:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 3 Aug 2007 09:02:54 +0000 (09:02 +0000)
     and 'f3673f80e35fb4097d5f8c0d985464aa797b71f4'


Trivial merge