merge of '027df8bfceecb5d21ab2b2b76d0d191124b3446b'
authorKoen Kooi <koen@openembedded.org>
Wed, 16 Jul 2008 09:24:30 +0000 (09:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 16 Jul 2008 09:24:30 +0000 (09:24 +0000)
commitc02b12845098ea158f4b22e949f4a966e82314a7
tree85a53586ec22458febd56c631fc333bd916eaab9
parent2f11ba39ea6f6f5c239cfec189bb567404e54958
parent3099e5f9471bf2612f39dc6faa9998e679c62351
Merge ... '027df8bfceecb5d21ab2b2b76d0d191124b3446b'
     and 'daafad010cbf738246a5e77122c2e1e4f951c9f5'