From: Richard Purdie <rpurdie@rpsys.net>
Date: Tue, 4 Apr 2006 21:30:08 +0000 (+0000)
Subject: merge of c49f612c2c8f57536e2e1711896a786e87f9c916
X-Git-Tag: Release-2010-05/1~9453^2~2096^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d771e265544556b261e44c42ef6e6f3cf966ba7d;p=openembedded.git

merge of c49f612c2c8f57536e2e1711896a786e87f9c916
     and e5a38d83b512c0a632ec3bd86a9e8066a38574ce
---

d771e265544556b261e44c42ef6e6f3cf966ba7d