From: Cliff Brake <cbrake@bec-systems.com>
Date: Sat, 8 Jul 2006 20:42:48 +0000 (+0000)
Subject: merge of e24156fa5aa230f0a3328a27650970263b3b3c9f
X-Git-Tag: Release-2010-05/1~9453^2~1282^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ab456509872fb6f1873c6ba2ee63a3a4cbdb064;p=openembedded.git

merge of e24156fa5aa230f0a3328a27650970263b3b3c9f
     and fba35ad4edfa08175ea02d3d52147bbcf9f3cfd8
---

5ab456509872fb6f1873c6ba2ee63a3a4cbdb064