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

merge of 73cf0a318b1b84e8654ced45a301d96cd45db206
     and 913ca757b0ffc1900151c599e92abad2579ceaf6
---

b85868c26f4d5a6508956133f5e5f2cfe3efdeeb