From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 6 Apr 2008 22:19:45 +0000 (+0000)
Subject: merge of '262ebdec7339ba774fffa1aa586eb226acd32493'
X-Git-Tag: Release-2010-05/1~7247
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbca01e0fc7d470346573de02b3f0e7dbf8dd6a4;p=openembedded.git

Merge ... '262ebdec7339ba774fffa1aa586eb226acd32493'
     and '7ce1c09c2ab95fc13a699ae089ac05fba3e7024c'
---

fbca01e0fc7d470346573de02b3f0e7dbf8dd6a4