From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 19 Dec 2007 06:52:24 +0000 (+0000)
Subject: merge of '3fa699bc0a61f0428ee89c547a1c840aeaa076c3'
X-Git-Tag: Release-2010-05/1~8136^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b338a511759b7687ad0f165121ffddab7f7b65e5;p=openembedded.git

Merge ... '3fa699bc0a61f0428ee89c547a1c840aeaa076c3'
     and '7d09f4b4eadc0654db7add3b9a29d77f0350e9a9'
---

b338a511759b7687ad0f165121ffddab7f7b65e5