From: Matthias Hentges <oe@hentges.net>
Date: Sat, 5 Jan 2008 20:38:16 +0000 (+0000)
Subject: merge of '2df396d3c9bb3f2afb58c9ecb59aba197323bf87'
X-Git-Tag: Release-2010-05/1~8014
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3344d43f7614643796b97340e567e6eb712c3026;p=openembedded.git

Merge ... '2df396d3c9bb3f2afb58c9ecb59aba197323bf87'
     and '9bda98155004c06ada379ea6494e26df0e41c6fe'
---

3344d43f7614643796b97340e567e6eb712c3026