From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 20 Nov 2006 14:35:15 +0000 (+0000)
Subject: merge of '6c6d6fcd3941c653a9ea8f2a3ebf593147530821'
X-Git-Tag: Release-2010-05/1~9453^2~397
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e783b87509f89e1d024450de05acacbfeed4dda;p=openembedded.git

Merge ... '6c6d6fcd3941c653a9ea8f2a3ebf593147530821'
     and 'af4fef7c47a7bd9d53b690340e39ebeaddaf676e'
---

4e783b87509f89e1d024450de05acacbfeed4dda