merge of '3fb5d51ceb8343d28129bfcd6d65bd7525eac8d6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 22 Aug 2006 10:42:09 +0000 (10:42 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 22 Aug 2006 10:42:09 +0000 (10:42 +0000)
commit6441bc7c4f9401bebb79da05ae1bed085337fa9a
tree9affd7ebd48ab9d52e6967bca71817dab5f79d3b
parent3109615e98eddd744d9ba9b428086ae7964944c7
parent288100abb8fb1973b071b93f89c5f112659e23e8
Merge ... '3fb5d51ceb8343d28129bfcd6d65bd7525eac8d6'
     and 'a1d8cff4002cc5f97598844ffb168b6320f0e80f'