From: Jamie Lenehan <lenehan@twibble.org>
Date: Thu, 7 Jun 2007 12:40:31 +0000 (+0000)
Subject: merge of '315cbb93869a360f92e32183f8c4dc46ba28faa5'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~62
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f2739b13ad5d0e5d2652ac83f59b0bfb197222a;p=openembedded.git

Merge ... '315cbb93869a360f92e32183f8c4dc46ba28faa5'
     and '5e2d15cbe531dc544eb1c04db1880abe0226013f'
---

6f2739b13ad5d0e5d2652ac83f59b0bfb197222a