From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 18 May 2007 00:00:36 +0000 (+0000)
Subject: merge of '246b0146c14e51a55e58803f7d5d1db831a78ee0'
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
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca25eb49e43df9c9b0f9fcb301edd9407b1cc269;p=openembedded.git

Merge ... '246b0146c14e51a55e58803f7d5d1db831a78ee0'
     and '3c1fbc69e461f4db65d841f9f35904b4720e3a4a'
---

ca25eb49e43df9c9b0f9fcb301edd9407b1cc269