From: Cliff Brake <cbrake@bec-systems.com>
Date: Wed, 7 Feb 2007 20:01:14 +0000 (+0000)
Subject: merge of '23dabd48de15b4db8e9daecccce9ba8abe833091'
X-Git-Tag: Release-2010-05/1~9270^2~2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7db72c285ec4158d01a503fe935b39b82ac781e;p=openembedded.git

Merge ... '23dabd48de15b4db8e9daecccce9ba8abe833091'
     and '99e5a9f4390d24184ef4abe7104e01db61c3b431'
---

b7db72c285ec4158d01a503fe935b39b82ac781e