From: Jamie Lenehan <lenehan@twibble.org>
Date: Thu, 17 Aug 2006 04:20:40 +0000 (+0000)
Subject: merge of '5b22925a7b123db5cb7c74c47b0d46e3a3510df6'
X-Git-Tag: Release-2010-05/1~9453^2~939
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7822bc5fb71db61e196b50198550cbd6c76bd12e;p=openembedded.git

Merge ... '5b22925a7b123db5cb7c74c47b0d46e3a3510df6'
     and '762d15cea90d092ff79de7791fbb02571ec2d15d'
---

7822bc5fb71db61e196b50198550cbd6c76bd12e