From: Holger Freyther <zecke@selfish.org>
Date: Sat, 11 Nov 2006 22:40:19 +0000 (+0000)
Subject: merge of '889b38d9aefee8fdff26966f3716f5e5a12ac8be'
X-Git-Tag: Release-2010-05/1~9453^2~481^2^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3088cbe5754d03762722ae4ca05de2063485864;p=openembedded.git

Merge ... '889b38d9aefee8fdff26966f3716f5e5a12ac8be'
     and 'c370f7ef14194698681f362610060c2a106412ac'
---

f3088cbe5754d03762722ae4ca05de2063485864