From: Richard Purdie <rpurdie@rpsys.net>
Date: Wed, 14 Jun 2006 23:58:34 +0000 (+0000)
Subject: merge of fb384f800bdb59aeed9d7bff06f6fa477bb6ddd6
X-Git-Tag: Release-2010-05/1~9453^2~1459^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b22d41ba3ff712483da8bfcf6e5813903c2fb3de;p=openembedded.git

merge of fb384f800bdb59aeed9d7bff06f6fa477bb6ddd6
     and dbb4f8c5ce9d6875e4b652532e08c39932325b64
---

b22d41ba3ff712483da8bfcf6e5813903c2fb3de