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

merge of 989c601b241187e89e1b85f31d57160876e846cd
     and b10e32a60893fe8d66257a00d52ef37b7219b121
---

7b2dab2782c752a00ff5668ba0fde5f70973b587