merge of '1aa9d5d2291a43dd7550da56fed4507af7db2c81'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Aug 2007 15:32:20 +0000 (15:32 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Aug 2007 15:32:20 +0000 (15:32 +0000)
commit43698063633ea099b64b141e251d12a007977bd2
tree7e68db2738686540702c8a0ccbc237de045a7274
parenta2bded6ad1c199dfeef28e27407b7f3ec750db35
parent84815b3bdb5039f9ca69606b4a2c66074900d2ac
Merge ... '1aa9d5d2291a43dd7550da56fed4507af7db2c81'
     and 'e36bd25beb3708ad700892730953005d81ac203b'