From: Graeme Gregory <dp@xora.org.uk>
Date: Tue, 4 Apr 2006 12:05:17 +0000 (+0000)
Subject: merge of 426f329c095d506a4beca58b86c1f674c3f3aaff
X-Git-Tag: Release-2010-05/1~9453^2~2107^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77cd8111623f848fdfeb57fc7a9acc30bcd8c72f;p=openembedded.git

merge of 426f329c095d506a4beca58b86c1f674c3f3aaff
     and 6881dd1f7588781d1430c0f6307b856be66ee86d
---

77cd8111623f848fdfeb57fc7a9acc30bcd8c72f