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

merge of 6a4cba9a5f2d744231cc63907df52f0615c8d744
     and d4b3457f03ed0db8daf044b353b4817b3046a7cd
---

db03be615f53604933e2f9ab2d28dcd56f9f7ed7