merge of '56286ad1242ca609acecef5bc84883c2f9de92bb'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 6 Dec 2007 11:34:42 +0000 (11:34 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 6 Dec 2007 11:34:42 +0000 (11:34 +0000)
     and '9981f4c01256065169ba2a4cd1e33f5e6b565e61'


Trivial merge