merge of '66d9cc1155353a9e1d178f4143dd89f86fc64dcb'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 3 Apr 2008 05:22:30 +0000 (05:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 3 Apr 2008 05:22:30 +0000 (05:22 +0000)
commit5b2b84327afb9a448b202dba506466f90fd346a5
treeceefc908d665b9c0f32919af97604b5f6a0ef6fc
parent5174d5b1fc20573a62e69ddaeb73e6146a16df8d
parentd01b5ac82ce8fe54aae6319de92b68dffc104d8a
Merge ... '66d9cc1155353a9e1d178f4143dd89f86fc64dcb'
     and 'dfcef904001ea652ac525bfc9b2f775f88de1d70'