From: Robert Schuster <thebohemian@gmx.net>
Date: Thu, 3 Apr 2008 22:04:36 +0000 (+0000)
Subject: merge of '96db59323d7ef9906344cc1f7228b381c996ab07'
X-Git-Tag: Release-2010-05/1~7249^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=657e5f8fa7cd2562dc0dc7123c71f827fc09b52a;p=openembedded.git

Merge ... '96db59323d7ef9906344cc1f7228b381c996ab07'
     and 'd69636e5f2a11a4de46efbbc1b4972a8a0186d3b'
---

657e5f8fa7cd2562dc0dc7123c71f827fc09b52a