From: Thomas Kunze <thommycheck@gmx.de>
Date: Sun, 3 Aug 2008 23:40:54 +0000 (+0000)
Subject: merge of '0c6c5626491aa3d427ad2222eaa182e53154da9e'
X-Git-Tag: Release-2010-05/1~6369
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8763cfad52a31b4125e98ca61da98cb0ae615328;p=openembedded.git

Merge ... '0c6c5626491aa3d427ad2222eaa182e53154da9e'
     and '1b38165e32339d1af5c9bb0a0200860939e559b3'
---

8763cfad52a31b4125e98ca61da98cb0ae615328