From: Philip Balister <philip@balister.org>
Date: Wed, 10 Jan 2007 13:14:36 +0000 (+0000)
Subject: merge of '1d7800b8e55aef9b9ad0a93c8ef6fa8ed0d43bbb'
X-Git-Tag: Release-2010-05/1~9400^2~1^2~3^2~6^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a958b7df1dd716b5716051485d215a7405b6afee;p=openembedded.git

Merge ... '1d7800b8e55aef9b9ad0a93c8ef6fa8ed0d43bbb'
     and '5526531f00b7c89c4184a355200bdb013a8840e3'
---

a958b7df1dd716b5716051485d215a7405b6afee