From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 22 Nov 2007 15:37:15 +0000 (+0000)
Subject: merge of '0a649e59614b2140ef8f93c2dc52b1361f2acb0b'
X-Git-Tag: Release-2010-05/1~8243^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7031df88c171569adb7c6827df18cc86ba1f5b44;p=openembedded.git

Merge ... '0a649e59614b2140ef8f93c2dc52b1361f2acb0b'
     and '0b7b234637a0d41420b6a596ef10e38857ff6f57'
---

7031df88c171569adb7c6827df18cc86ba1f5b44