From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 8 Sep 2006 21:31:32 +0000 (+0000)
Subject: merge of 11629dc197196189f4cf0e12925a0a47fd9839ef
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d92c1657c2251c9e2986365cce6faad2e5cea487;p=openembedded.git

merge of 11629dc197196189f4cf0e12925a0a47fd9839ef
     and e999e3205cfe7ada12266cc57fa4782ff84b6b61
---

d92c1657c2251c9e2986365cce6faad2e5cea487