From: Koen Kooi <koen@openembedded.org>
Date: Wed, 20 Jul 2005 07:08:15 +0000 (+0000)
Subject: merge of ae86a51b6b338f8674cb343b7489121aaf099abc
X-Git-Tag: Release-2010-05/1~9453^2~4117
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57b832bfee7133f34e9645d36817b6f0aac2389b;p=openembedded.git

merge of ae86a51b6b338f8674cb343b7489121aaf099abc
     and f7ca9da6142ab119cb4999176caa84671258b1c8
---

57b832bfee7133f34e9645d36817b6f0aac2389b