merge of 'a3f70cd2a992c589229f378af83c2253d8f67020'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 6 Dec 2007 20:16:17 +0000 (20:16 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 6 Dec 2007 20:16:17 +0000 (20:16 +0000)
commitd59ff47b01632eb7fcee473c490c8579b9a11faf
tree35a2806eff0093b32533375a658b1a2cf0f02e38
parentf46df8d4334dcfe56414655731115cfa466e7188
parentfb89e1265c288b619f04c0f6c06193c8e1a0a46d
Merge ... 'a3f70cd2a992c589229f378af83c2253d8f67020'
     and 'a765f36f1da22af8948e85fe748ba05d32184706'