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

merge of 89964d35598b9173cc7fd75859aa0b768501903f
     and a13b076d623fdb8b0a21940bc4ec1cb87292cff2
---

0f32d2861643a39a2fca2e9c4505a2183ecf41d1