From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 31 Jul 2005 19:15:56 +0000 (+0000)
Subject: merge of 80eff09c5e9d2b1404eef22e530ed430302e8875
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~4^2~62
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c006d6ba325d37f22f91a7b46a77239a38178743;p=openembedded.git

merge of 80eff09c5e9d2b1404eef22e530ed430302e8875
     and ea728072febab8471c31add474a18b864de00bfe
---

c006d6ba325d37f22f91a7b46a77239a38178743