From: Holger Freyther <zecke@selfish.org>
Date: Wed, 15 Nov 2006 00:08:01 +0000 (+0000)
Subject: merge of '7cf3b400cf166b89986056289fa50151e6511f08'
X-Git-Tag: Release-2010-05/1~9453^2~494
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99a536b0501b9e5dc4883c3ca8861ef852566218;p=openembedded.git

Merge ... '7cf3b400cf166b89986056289fa50151e6511f08'
     and 'cbaa08b3cff2b520cf8b1843f19eea0d9539c2f4'
---

99a536b0501b9e5dc4883c3ca8861ef852566218