From: Philip Balister <philip@balister.org>
Date: Fri, 4 Jul 2008 13:27:42 +0000 (+0000)
Subject: merge of '8f996463a60dbfcc7f4d2c5d595f26e0e2bdb241'
X-Git-Tag: Release-2010-05/1~6576^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1454581b4c4950bf63402c56e7a500e2815bbbde;p=openembedded.git

Merge ... '8f996463a60dbfcc7f4d2c5d595f26e0e2bdb241'
     and 'f5868314ec3adec0707c1ac080a62e860e2ef3ed'
---

1454581b4c4950bf63402c56e7a500e2815bbbde