merge of '764fab90ce78632168aaaa389123bbc7beacc0af'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 18 Nov 2006 09:48:40 +0000 (09:48 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 18 Nov 2006 09:48:40 +0000 (09:48 +0000)
commitc916c07dc3e6597f63dc5486daaab03f6cb2b49a
treefdcc2968d89eb8460ee7ee1e314de9e3e5303fb8
parente661da73478c651edde4f8a043ab61b2b43857eb
parentf9fa013a67614490729c3a4a514637ec54bf4430
Merge ... '764fab90ce78632168aaaa389123bbc7beacc0af'
     and '9ef42c4cea604726d2f11a3693579baae9320074'