merge of '69c4f23827bd5d45cfcc6008cf24a3877da4126e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 10 Jul 2007 11:20:53 +0000 (11:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 10 Jul 2007 11:20:53 +0000 (11:20 +0000)
commit3615d96b98cb45c801b781b504aa3f9f33c04c26
tree88edbe9e92367e3ed7867f718458ede47566a392
parent5e4e06663099c1b2f193068d38654f9ced7f48aa
parent8bd59599aecdf2b133dabfb0bd5e65f2bac4eb90
Merge ... '69c4f23827bd5d45cfcc6008cf24a3877da4126e'
     and '92f0750aade452d9021d2d2bd259d1b86edde5b5'