From: Jamie Lenehan <lenehan@twibble.org>
Date: Mon, 11 Sep 2006 08:25:51 +0000 (+0000)
Subject: merge of 'c3ccb88cdee78aea39d63a6124314b875def14c8'
X-Git-Tag: Release-2010-05/1~9453^2~843^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8892e4d0408815c5badf0ea5a5a71828ca2389e9;p=openembedded.git

Merge ... 'c3ccb88cdee78aea39d63a6124314b875def14c8'
     and 'ccc0894b166e387c9e2ae80e0f6e03fee22306d5'
---

8892e4d0408815c5badf0ea5a5a71828ca2389e9