From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Tue, 4 Dec 2007 11:26:31 +0000 (+0000)
Subject: merge of '3e94a66ec6e7fc142c7d737c555c1f7330a6b02a'
X-Git-Tag: Release-2010-05/1~8180^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b4b3060fb466e34ca2f6b11be8b24c5d4fc718c;p=openembedded.git

Merge ... '3e94a66ec6e7fc142c7d737c555c1f7330a6b02a'
     and '8c692ec4078a7d2e345213289da925bfca3cac63'
---

1b4b3060fb466e34ca2f6b11be8b24c5d4fc718c