From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Sun, 9 Mar 2008 21:09:48 +0000 (+0000)
Subject: merge of 'aa8972a1a5b088933a6f3918732ec23ff5b2edf6'
X-Git-Tag: Release-2010-05/1~7516
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=656c6af32e35b87f8e9062369599b17047cbefb0;p=openembedded.git

Merge ... 'aa8972a1a5b088933a6f3918732ec23ff5b2edf6'
     and 'eeef9d48ea3be5f822125be3f1ce20c53aa97078'
---

656c6af32e35b87f8e9062369599b17047cbefb0