From: Matthias Hentges <oe@hentges.net>
Date: Sat, 17 Mar 2007 17:00:49 +0000 (+0000)
Subject: merge of '321bc83276f29f5ade630f7aedf3da763002f5a0'
X-Git-Tag: Release-2010-05/1~8868^2~1032^2~15^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a828847f3281b8c4254cf89a551c9dcf3e0e4787;p=openembedded.git

Merge ... '321bc83276f29f5ade630f7aedf3da763002f5a0'
     and '9258a684c6be4358d5956574613b8f216e7c1775'
---

a828847f3281b8c4254cf89a551c9dcf3e0e4787