From: Paul Eggleton <bluelightning@bluelightning.org>
Date: Wed, 8 Oct 2008 19:07:08 +0000 (+0000)
Subject: merge of '88676b03209e4a8147b6f9ab4d6f5c66d0132128'
X-Git-Tag: Release-2010-05/1~5850^2~7^2~4^2~3^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfc178f2ca021d618aa5bfa225c13bd4269c1e33;p=openembedded.git

Merge ... '88676b03209e4a8147b6f9ab4d6f5c66d0132128'
     and 'bcae381ccf0226faafe756ae8699c9b1623bf951'
---

bfc178f2ca021d618aa5bfa225c13bd4269c1e33