From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 25 Mar 2007 22:13:27 +0000 (+0000)
Subject: merge of '33abb5c4baf70a48836aa488bb5c4229e5b3d9b8'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2^2~1^2~2^2^2~2^2^2~6^2^2~1^2~1^2^2~1^2^2^2^2~4^2~1^2~1^2^2^2^2^2~1^2^2^2~1^2^2^2^2~7^2^2~1^2^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cfb4c265a07d09617da7c8ccb1fa7d61ba48a8a;p=openembedded.git

Merge ... '33abb5c4baf70a48836aa488bb5c4229e5b3d9b8'
     and '33dc2a587b8be8674e81f177135b2766463febfb'
---

2cfb4c265a07d09617da7c8ccb1fa7d61ba48a8a