From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sun, 17 Jun 2007 11:11:14 +0000 (+0000)
Subject: merge of '688b2cdecdf3a0e190f7bd6e3a1bef263058f757'
X-Git-Tag: Release-2010-05/1~8868^2~344
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a726a60e1e6ff72b268832fd48501499ff9df47b;p=openembedded.git

Merge ... '688b2cdecdf3a0e190f7bd6e3a1bef263058f757'
     and '815032281c4fa6bc06533e41b2b364caf104969f'
---

a726a60e1e6ff72b268832fd48501499ff9df47b