From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 7 Sep 2006 13:31:23 +0000 (+0000)
Subject: merge of 122cbbd5766b555e1b08e258f0f09450b1781ec8
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2^2^2~1^2^2~1^2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74a4862848d8d17d69c97f8f370c2261bd10b3b0;p=openembedded.git

merge of 122cbbd5766b555e1b08e258f0f09450b1781ec8
     and f7205a1927f65e5903bb16a133ed12fa41037e57
---

74a4862848d8d17d69c97f8f370c2261bd10b3b0