From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 30 Dec 2006 10:17:20 +0000 (+0000)
Subject: merge of 67ee830cf5e13981f991348862d52014162c9dcf
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1^2~1^2~1^2~1^2^2^2^2^2^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e87b7bc4f9a96ced42bd41883e16911494e938a9;p=openembedded.git

merge of 67ee830cf5e13981f991348862d52014162c9dcf
     and bbe0f81068d50c751254355e444d82da046b3a41
---

e87b7bc4f9a96ced42bd41883e16911494e938a9