From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 18 Aug 2006 13:30:54 +0000 (+0000)
Subject: merge of 1ce847551d29aa89a9004dbe9df99547f6f93e3f
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2^2^2~5^2^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d31887f5af3b716809915cc57548a6444c88f2b;p=openembedded.git

merge of 1ce847551d29aa89a9004dbe9df99547f6f93e3f
     and 24bcf5837228b66a9599b02fe299f374ba9db2fb
---

7d31887f5af3b716809915cc57548a6444c88f2b