From: Matthias Hentges <oe@hentges.net>
Date: Sat, 23 Jul 2005 17:54:51 +0000 (+0000)
Subject: merge of 2825a1f6c313a584c9a9be152d255ab1e4bacedb
X-Git-Tag: Release-2010-05/1~9453^2~4086
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd84962fab15e23ad1add164618b7fda6eb5104b;p=openembedded.git

merge of 2825a1f6c313a584c9a9be152d255ab1e4bacedb
     and ad18daa1dd522a0e575f57713e7f253557cbde11
---

bd84962fab15e23ad1add164618b7fda6eb5104b