From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 9 Mar 2008 19:49:03 +0000 (+0000)
Subject: merge of 'aa8972a1a5b088933a6f3918732ec23ff5b2edf6'
X-Git-Tag: Release-2010-05/1~7510^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b42f355f5e621f126b9db86cef8419509ed1e13;p=openembedded.git

Merge ... 'aa8972a1a5b088933a6f3918732ec23ff5b2edf6'
     and 'e3bce18db3557d05994587f4a53578acbc1f3792'
---

1b42f355f5e621f126b9db86cef8419509ed1e13