merge of '04f4f8d195ec1a23e53f2158cf15535337100d4f'
authorKoen Kooi <koen@openembedded.org>
Sat, 29 Jul 2006 18:01:31 +0000 (18:01 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 29 Jul 2006 18:01:31 +0000 (18:01 +0000)
commita8774bdc398d97ded23d48614393b03cbd7af376
tree9d54c7e871a1202d5182d48653e3a1d00232310a
parent2f2dd36857503e4d146fdc17baa5d116580574d9
parentbd2c2afe88f505657d3d0c1ad8c6479688b071d3
Merge ... '04f4f8d195ec1a23e53f2158cf15535337100d4f'
     and 'a2037f5a81477506111846d9e8e8c70baee9a86a'