From: Matthias Hentges <oe@hentges.net>
Date: Fri, 1 Jun 2007 23:29:44 +0000 (+0000)
Subject: merge of '29262672242dce33a5d94bf91091b9a5a7ea7621'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~106
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee46004e7812188b6f432d87ebdb41a18d120d57;p=openembedded.git

Merge ... '29262672242dce33a5d94bf91091b9a5a7ea7621'
     and '9f671f6c3a17dbd8450e267353cf95d120238e50'
---

ee46004e7812188b6f432d87ebdb41a18d120d57