merge of 'a3f70cd2a992c589229f378af83c2253d8f67020'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 6 Dec 2007 20:16:17 +0000 (20:16 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 6 Dec 2007 20:16:17 +0000 (20:16 +0000)
     and 'a765f36f1da22af8948e85fe748ba05d32184706'


Trivial merge