From: Koen Kooi <koen@openembedded.org>
Date: Sat, 11 Aug 2007 10:46:52 +0000 (+0000)
Subject: merge of '1bd825374fa13ede0bf18088241b5f6082e92e36'
X-Git-Tag: Release-2010-05/1~9043
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05991c5873530c5b7233e334d3d07323fc061b0c;p=openembedded.git

Merge ... '1bd825374fa13ede0bf18088241b5f6082e92e36'
     and 'e7f9cc8373c592db0fd5e595010f3aaf8a3b0890'
---

05991c5873530c5b7233e334d3d07323fc061b0c