From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 8 Feb 2008 14:53:04 +0000 (+0000)
Subject: merge of '966f676702aa63ef60cf920469fe2209089901c4'
X-Git-Tag: Release-2010-05/1~7713^2~5^2~5^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d4024bfd7fc3d0fd30b470e6cf982428abc322e;p=openembedded.git

Merge ... '966f676702aa63ef60cf920469fe2209089901c4'
     and 'c22e6cdc0081f060e54d4e152ce8e2adb2546893'
---

2d4024bfd7fc3d0fd30b470e6cf982428abc322e