From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 6 Feb 2007 07:38:17 +0000 (+0000)
Subject: merge of '1322f90b18589872dfe43f3e8fb8fafff1f58e20'
X-Git-Tag: Release-2010-05/1~9273^2~4^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=493255c0ada70a916c0cd8604ac40a7011ba728f;p=openembedded.git

Merge ... '1322f90b18589872dfe43f3e8fb8fafff1f58e20'
     and '1e9ea5837bfd496b91787865dfdb897abb24e773'
---

493255c0ada70a916c0cd8604ac40a7011ba728f