From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Jul 2006 11:25:14 +0000 (+0000)
Subject: merge of bc6865af3caaa538f4c0db9e72531ab942db996c
X-Git-Tag: Release-2010-05/1~9453^2~1345^2~8^2~7^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d649adfcaf691303147f0ac30a41ec1f0ba8394b;p=openembedded.git

merge of bc6865af3caaa538f4c0db9e72531ab942db996c
     and e11d5bc6095b312e2da53fa0044c962ba24663b5
---

d649adfcaf691303147f0ac30a41ec1f0ba8394b