From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Sun, 25 May 2008 19:04:48 +0000 (+0000)
Subject: merge of '74b9e2f30013cb1f9e8090a8642900ae33d12d3e'
X-Git-Tag: Release-2010-05/1~6858
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93dc2a057c6cdba133cb5bd6f513215eb114d507;p=openembedded.git

Merge ... '74b9e2f30013cb1f9e8090a8642900ae33d12d3e'
     and 'be15c58b0a9d4e7ab6b2bc0470525b44a5d5f862'
---

93dc2a057c6cdba133cb5bd6f513215eb114d507