From: Philip Balister <philip@balister.org>
Date: Sun, 11 Mar 2007 18:39:19 +0000 (+0000)
Subject: merge of 'b0e8a7b18bc538b2926b839a1a3adad6234a53e0'
X-Git-Tag: Release-2010-05/1~8868^2~1105^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51053d021c7d57e379e088fc0592895df748e0b1;p=openembedded.git

Merge ... 'b0e8a7b18bc538b2926b839a1a3adad6234a53e0'
     and 'bfad7eb7e40db9284b9271f1a40a8fa4ec870886'
---

51053d021c7d57e379e088fc0592895df748e0b1