From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 24 Dec 2006 10:17:54 +0000 (+0000)
Subject: merge of 8eaefa4f638dc67e29fb59fca3c6a98e4049eb09
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~3^2~1^2~1^2^2^2~2^2^2~1^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=156db0731842e3ba42ed98c51b62dcb73c7b9d16;p=openembedded.git

merge of 8eaefa4f638dc67e29fb59fca3c6a98e4049eb09
     and 960ec1ce1ce07462d6b9bf9eab1de5bcd2ba1102
---

156db0731842e3ba42ed98c51b62dcb73c7b9d16