merge of '4876e130f4dda342390929a72c2c452dfa33d3ac'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:24:40 +0000 (11:24 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:24:40 +0000 (11:24 +0000)
commit7cbe26dd9647243ade652ef1a7a6fbb2402c6576
tree162b32aa7ee07da4b9169ac44325ee475a042065
parent4b7e6a49215b00d0cfa9a0fde3808f032a9599e5
parent6a4f79a712999ac6764b7424adbeb86272a1eda4
Merge ... '4876e130f4dda342390929a72c2c452dfa33d3ac'
     and 'e0d9912acaac13bd724188fe1ad13ef35363ee75'