merge of '1ba9df24f1f8128a61ec636e73db71360782f1fc'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 8 Oct 2007 09:25:06 +0000 (09:25 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 8 Oct 2007 09:25:06 +0000 (09:25 +0000)
commitc57324b477a8fe770b43452dd9250b487ec2823c
treec42345c1ccc99b2a568dd0155cbe40689a38829b
parent25bd38be9bc08d566ae04b86f5489cfe203b1188
parent35d1f606683525f277e95b46be519e57cbc0be3d
Merge ... '1ba9df24f1f8128a61ec636e73db71360782f1fc'
     and '1d14c551bc1dbe1ac63e66db38db383600d6a812'