From: Philip Balister <philip@balister.org>
Date: Fri, 10 Nov 2006 17:37:45 +0000 (+0000)
Subject: merge of 'a662fc20449855dbd33b90211dc1cb5cf3f6fcd9'
X-Git-Tag: Release-2010-05/1~9453^2~481^2~3^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d55a4e435a19c9518d3b8ca32c8dec56809d8e5c;p=openembedded.git

Merge ... 'a662fc20449855dbd33b90211dc1cb5cf3f6fcd9'
     and 'f787042885b4a9d148e33c77271086d4108b9e62'
---

d55a4e435a19c9518d3b8ca32c8dec56809d8e5c