From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 8 Mar 2007 23:11:07 +0000 (+0000)
Subject: merge of 'b4827e098fbbf66579c962a3d189b3e622b94406'
X-Git-Tag: Release-2010-05/1~8868^2~1099^2~2^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aeaac33bc061b342afc064800c00b1d49f3002a;p=openembedded.git

Merge ... 'b4827e098fbbf66579c962a3d189b3e622b94406'
     and 'df3adfe2ad30b67a7d45f03207aeb8fda510c37b'
---

3aeaac33bc061b342afc064800c00b1d49f3002a