From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 1 Sep 2008 18:12:37 +0000 (+0000)
Subject: merge of '5031449809d92a9131e43cf42ee07eaecb4fbeff'
X-Git-Tag: Release-2010-05/1~6173
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e6a273f44ed3729a91e2e27d8fc5e6097012a5a;p=openembedded.git

Merge ... '5031449809d92a9131e43cf42ee07eaecb4fbeff'
     and '61389ef93b16ad371a1a7c82bc60a4f061055b35'
---

5e6a273f44ed3729a91e2e27d8fc5e6097012a5a