From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 26 Aug 2006 15:16:24 +0000 (+0000)
Subject: merge of 4a577a9951c18f1d0fc283b8283e170639de59d6
X-Git-Tag: Release-2010-05/1~9453^2~837^2~1^2^2~1^2~3^2~1^2~1^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a79a013b627fe93b1b3506f6163ac31d340464f8;p=openembedded.git

merge of 4a577a9951c18f1d0fc283b8283e170639de59d6
     and c465e626ca49133142206eea25d099369d10040a
---

a79a013b627fe93b1b3506f6163ac31d340464f8