From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 6 Sep 2007 07:04:32 +0000 (+0000)
Subject: merge of '15bd9ab3bb169e676b199f732c73e4daa38511ce'
X-Git-Tag: Release-2010-05/1~8701^2~8^2~1^2~1^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=383e3f0e16189787640256ea89c96491ea9a2625;p=openembedded.git

Merge ... '15bd9ab3bb169e676b199f732c73e4daa38511ce'
     and '23eca17a29c5cd3c74a163af0f580f4e2b481162'
---

383e3f0e16189787640256ea89c96491ea9a2625