merge of '29f34b6c27e10d81f001d11a5e9ab29d1e915ffd'
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 11:14:02 +0000 (11:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 11:14:02 +0000 (11:14 +0000)
commit3f1aca31ac446635ff1b452f4f114fe2bd9718e8
treea79fc2ed0235fe17321caf572ab44cb8d0b5d922
parentefe359556d6854fe2953ecf586b00eedcdaf28cb
parent9c5a9ef052d117aab48ef0d7242209450a27dce4
Merge ... '29f34b6c27e10d81f001d11a5e9ab29d1e915ffd'
     and 'e1bf125b596e0dbb381f6cc4ea272fcd16c78199'