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)
commit71bd0cd9cf4addbc38028705674fb56c2a644071
tree04bde4e58d7f44baa5658f9b16873bf41db91c06
parentf1fac8939e88ca25e8227a6e97393eb216abd738
parentf9697f0df1fde19b11a0c358ceca01129526cfc6
Merge ... '3c1d5bb41a1a43996eb9d3ac2133cb180c1e9033'
     and 'c8d646c13830529be97991372255b375e54b8df1'