From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 14 Apr 2006 10:18:46 +0000 (+0000)
Subject: merge of 459e8f3f8c5df4c497dd7bbb61a777513bbbfc91
X-Git-Tag: Release-2010-05/1~9453^2~1922
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea0453416e73df34755112cffe35741ef9a65d2e;p=openembedded.git

merge of 459e8f3f8c5df4c497dd7bbb61a777513bbbfc91
     and 654ad23c020362def38f08a15b338176247f3029
---

ea0453416e73df34755112cffe35741ef9a65d2e