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

merge of 5184d5d01f81fcaa198426dc405ef4635ac0099e
     and 75401918dca3876106733c357fd6be43748c9bab
---

ab9464140b9120ec8a0cc5f8ddec50cd7f85bfb4