From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 6 Dec 2005 12:01:35 +0000 (+0000)
Subject: merge of 1836da10f903d9ee68a7255b7a5d899128f4f43c
X-Git-Tag: Release-2010-05/1~9453^2~2967^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa467290637b8d7ac2401d2b89f13ac5c04eef2f;p=openembedded.git

merge of 1836da10f903d9ee68a7255b7a5d899128f4f43c
     and d52c3796ab80d51e4749743886263398c84dffac
---

aa467290637b8d7ac2401d2b89f13ac5c04eef2f