From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 8 Feb 2006 11:54:37 +0000 (+0000)
Subject: merge of 56993761cfcc246959dccb5e35fa402c5c3c9738
X-Git-Tag: Release-2010-05/1~9453^2~2382^2~1^2^2^2~2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d28ecc02a19278b07d847120f613c9f6fe1f850;p=openembedded.git

merge of 56993761cfcc246959dccb5e35fa402c5c3c9738
     and 93e5bd9df4fa3927a9dfb67420d1a48ab721c007
---

8d28ecc02a19278b07d847120f613c9f6fe1f850