From: Holger Freyther <zecke@selfish.org>
Date: Mon, 17 Mar 2008 14:19:29 +0000 (+0000)
Subject: merge of '3ad0844ce9d5f38938193e537eef14f3eedc5aaa'
X-Git-Tag: Release-2010-05/1~7106^2^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c4f924d701e245410cef139d29eba10dd058194;p=openembedded.git

Merge ... '3ad0844ce9d5f38938193e537eef14f3eedc5aaa'
     and 'c6487ccb0affa59758f32bd6af992ddd0508d2b5'
---

6c4f924d701e245410cef139d29eba10dd058194