From: Daniel Willmann <daniel@totalueberwachung.de>
Date: Thu, 12 Jul 2007 22:38:14 +0000 (+0000)
Subject: merge of '1334265f6bc3427cfeef0ed8c21ef13a71da950c'
X-Git-Tag: Release-2010-05/1~8868^2~157^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=299614934872b58c4bb3fe987f274b8c937c2532;p=openembedded.git

Merge ... '1334265f6bc3427cfeef0ed8c21ef13a71da950c'
     and '455900b48a266ba79c042da92cdef20b5fe89006'
---

299614934872b58c4bb3fe987f274b8c937c2532