From: Robert Schuster <thebohemian@gmx.net>
Date: Sun, 5 Oct 2008 15:31:39 +0000 (+0000)
Subject: merge of 'ae8724641e6c8131ac3706e49cd36a7e993fc697'
X-Git-Tag: Release-2010-05/1~5850^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5731ad06007b17aa25da00f99776de4c1bc16512;p=openembedded.git

Merge ... 'ae8724641e6c8131ac3706e49cd36a7e993fc697'
     and 'e74e0c0ff5084d996f1c4b3b2c87244159a057ee'
---

5731ad06007b17aa25da00f99776de4c1bc16512