merge of '736e3745c824a8c11dfc76795f69158b8940190a'
authorKoen Kooi <koen@openembedded.org>
Tue, 29 Aug 2006 09:07:38 +0000 (09:07 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 29 Aug 2006 09:07:38 +0000 (09:07 +0000)
commita7279a2894397237252dc4274ef6c4c6192780bb
treeed3acb1411ccefed964d7e218d3b64e37bccb51c
parentb0915887c4f041c2004f5fcb286eba5b42e02d84
parent1ed378b6258e7df0a51fe7082ceded34581245a9
Merge ... '736e3745c824a8c11dfc76795f69158b8940190a'
     and 'aa2272bf90f42c5648bd3b21c7395aeb71f025fd'