From: Jamie Lenehan <lenehan@twibble.org>
Date: Wed, 30 May 2007 00:02:52 +0000 (+0000)
Subject: merge of '99133b6a252718e1e4b91a43a3a2dc3b7a6cfbdd'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~152
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afefc176dc8f5eff975d4102914068f88cc782c2;p=openembedded.git

Merge ... '99133b6a252718e1e4b91a43a3a2dc3b7a6cfbdd'
     and 'cfdef5c70cac18e3f976428abe56e3b5461c80e0'
---

afefc176dc8f5eff975d4102914068f88cc782c2