From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 29 Apr 2006 16:20:34 +0000 (+0000)
Subject: merge of 14a4cb7c17e30cd099536c6ed0417a4550b5e687
X-Git-Tag: Release-2010-05/1~9453^2~1802
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cf27bc97eb54825a04c1d124ffdc83a3adb0846;p=openembedded.git

merge of 14a4cb7c17e30cd099536c6ed0417a4550b5e687
     and 805e846ce6f746ff365641db88c7294e287c7b8b
---

4cf27bc97eb54825a04c1d124ffdc83a3adb0846