From: Phil Blundell <philb@gnu.org>
Date: Thu, 18 Jan 2007 15:32:42 +0000 (+0000)
Subject: merge of '7022b2fb8c0b08d5f93f14844bb14a13991c7daa'
X-Git-Tag: Release-2010-05/1~9360^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db774cfc9ba6f54ebbdbce312481125489116c0a;p=openembedded.git

Merge ... '7022b2fb8c0b08d5f93f14844bb14a13991c7daa'
     and 'c77de7a09c5852f1bfe63afbd011ef701c76bdf6'
---

db774cfc9ba6f54ebbdbce312481125489116c0a