From: Koen Kooi <koen@openembedded.org>
Date: Sun, 4 Sep 2005 21:45:33 +0000 (+0000)
Subject: merge of 514709e2adeba06a2b887310a65a6b3b440f6076
X-Git-Tag: Release-2010-05/1~9453^2~3648^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07307be15183b31e81858870a4efde802c85f5f4;p=openembedded.git

merge of 514709e2adeba06a2b887310a65a6b3b440f6076
     and bfad0d650f31d9e9a3ce8fca87a95a84218252bf
---

07307be15183b31e81858870a4efde802c85f5f4