From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Dec 2007 11:10:51 +0000 (+0000)
Subject: merge of '47aec7f5811a7e41e48a85cc8ca83a9ef745e862'
X-Git-Tag: Release-2010-05/1~8180^2~12^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=680d0a26e2fc1dc87937c0e1138d49356f883bab;p=openembedded.git

Merge ... '47aec7f5811a7e41e48a85cc8ca83a9ef745e862'
     and '5f67fa16e46b84f45483e590d1acf78095ca9c44'
---

680d0a26e2fc1dc87937c0e1138d49356f883bab