From: Koen Kooi <koen@openembedded.org>
Date: Sun, 21 Oct 2007 15:18:45 +0000 (+0000)
Subject: merge of '288863eb61389cf9c42b3101a9e8cd27ebcd129a'
X-Git-Tag: Release-2010-05/1~8488
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7b92b8ac9721b554eb93c4c3fd7d2e787a8116a;p=openembedded.git

Merge ... '288863eb61389cf9c42b3101a9e8cd27ebcd129a'
     and 'f8424d0fef190f772371b3b3691233dbdd5e7b58'
---

f7b92b8ac9721b554eb93c4c3fd7d2e787a8116a