From: Koen Kooi <koen@openembedded.org>
Date: Mon, 20 Nov 2006 18:08:50 +0000 (+0000)
Subject: merge of '3d939eee6aecc2b2d2d099a3f29faf68ba2b347b'
X-Git-Tag: Release-2010-05/1~9453^2~381
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5229146f37c75353e7ee976db3113d743ac562d3;p=openembedded.git

Merge ... '3d939eee6aecc2b2d2d099a3f29faf68ba2b347b'
     and '630c8f4d885ea00cf76713379d5b1b9f9ccbe20c'
---

5229146f37c75353e7ee976db3113d743ac562d3