merge of '3c1d5bb41a1a43996eb9d3ac2133cb180c1e9033'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 30 Aug 2006 17:03:24 +0000 (17:03 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 30 Aug 2006 17:03:24 +0000 (17:03 +0000)
     and 'c8d646c13830529be97991372255b375e54b8df1'


Trivial merge