merge of '666358c5490cf7ad12c0b64e3e81b9d28fde6536'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 27 Apr 2007 08:23:05 +0000 (08:23 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 27 Apr 2007 08:23:05 +0000 (08:23 +0000)
commit3b374eeea75c1836dd14763413d6a69fd5257288
tree6f7ce7759384f61e8694108746e38d3e0380ac64
parent3cf447d1990e83a036a0272adb5eb198a8338784
parent3cc9d5463dac0412d5591b506e308f3e9cde0494
Merge ... '666358c5490cf7ad12c0b64e3e81b9d28fde6536'
     and 'a1a53de4dc6cdab69af325b6a2615e1c4b40caad'