From: Thomas Kunze <thommycheck@gmx.de>
Date: Thu, 4 Sep 2008 13:41:45 +0000 (+0000)
Subject: merge of '061e46a6247ee375f1eb975b1700e93e10652cb9'
X-Git-Tag: Release-2010-05/1~6157^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3552e0f5cb9c6e751c3e9100d7a897e78c2f2ad3;p=openembedded.git

Merge ... '061e46a6247ee375f1eb975b1700e93e10652cb9'
     and 'a8b3738fe9d7578507efdb8edd971c36ca53b159'
---

3552e0f5cb9c6e751c3e9100d7a897e78c2f2ad3