From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 3 Sep 2007 09:52:44 +0000 (+0000)
Subject: merge of '0bc3c3218eac32db6b13fb154e1fc29a0b348663'
X-Git-Tag: Release-2010-05/1~8723
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97a710af3809e6a9710c7149378220780abbcfc0;p=openembedded.git

Merge ... '0bc3c3218eac32db6b13fb154e1fc29a0b348663'
     and 'c1014f980e6dad4562c28412cfb1935df7ce9057'
---

97a710af3809e6a9710c7149378220780abbcfc0