From: Philip Balister <philip@balister.org>
Date: Mon, 12 Mar 2007 20:18:11 +0000 (+0000)
Subject: merge of '3bc6872ce914467c560f817b262f8d528b2cf3ed'
X-Git-Tag: Release-2010-05/1~8868^2~1092^2~1^2~7^2~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4387c8e6f727bdee91f8062be68053bc7b5d3c4;p=openembedded.git

Merge ... '3bc6872ce914467c560f817b262f8d528b2cf3ed'
     and '9f4106865181e79a488d71ba10eb5b39babf31ca'
---

a4387c8e6f727bdee91f8062be68053bc7b5d3c4