From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 7 Sep 2005 16:28:18 +0000 (+0000)
Subject: merge of 5302bee687f8bd56d8af70745304af2f59c19ec3
X-Git-Tag: Release-2010-05/1~9453^2~3607
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ac9ba56177e2d9a7e355def8b414022c0578436;p=openembedded.git

merge of 5302bee687f8bd56d8af70745304af2f59c19ec3
     and e60f9bf4e3714006cd19bf86bc76e3009a7bfff3
---

1ac9ba56177e2d9a7e355def8b414022c0578436