From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 25 Aug 2006 08:01:15 +0000 (+0000)
Subject: merge of 1010cdd56d6aa7beaa724d0136ed285942b3d461
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=482717b586a0f0da9f83c8d7a1b980e255c667c6;p=openembedded.git

merge of 1010cdd56d6aa7beaa724d0136ed285942b3d461
     and 158c7012230c89db37efd5ce5fbeffbcc607f6e0
---

482717b586a0f0da9f83c8d7a1b980e255c667c6