From: Philip Balister <philip@balister.org>
Date: Mon, 28 Jul 2008 21:07:54 +0000 (+0000)
Subject: merge of '6a6b5625ce1a2f68e15757a541a724d13945155a'
X-Git-Tag: Release-2010-05/1~6447
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d93806496ac41e79abddae49200433be36efc33;p=openembedded.git

Merge ... '6a6b5625ce1a2f68e15757a541a724d13945155a'
     and 'c11624e19576778237cea5d125bbc9f0b39d26cc'
---

7d93806496ac41e79abddae49200433be36efc33