From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 20 Nov 2007 21:44:05 +0000 (+0000)
Subject: merge of '479b064df21386e3f77f93516e86f40c7ea9ccfa'
X-Git-Tag: Release-2010-05/1~8326
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a69a66f78b10bcff1e8b050ed483797a3db197c;p=openembedded.git

Merge ... '479b064df21386e3f77f93516e86f40c7ea9ccfa'
     and 'ab14a7f33b13f2205a64293e2f2e29b20e943bf3'
---

4a69a66f78b10bcff1e8b050ed483797a3db197c