From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 2 Dec 2005 17:16:23 +0000 (+0000)
Subject: merge of ee7a6ae9f04d3b86e0a6b611e45b6380c8c337b2
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d53b117dae49d71ddd1388a673a5ca6df2c130c;p=openembedded.git

merge of ee7a6ae9f04d3b86e0a6b611e45b6380c8c337b2
     and f9c84000e93bf9f50a0ddf33a8097f22d724d95f
---

9d53b117dae49d71ddd1388a673a5ca6df2c130c