From: Philip Balister <philip@balister.org>
Date: Wed, 8 Aug 2007 23:08:40 +0000 (+0000)
Subject: merge of '036e2e71bb09d2efdeab9165b6946b947e4316b2'
X-Git-Tag: Release-2010-05/1~9084^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2834b0db4e4bad2956bf51638d1d3f4e7b48f25c;p=openembedded.git

Merge ... '036e2e71bb09d2efdeab9165b6946b947e4316b2'
     and '73523d2b53ed38a63f46fcb966b7de6091c0c9d5'
---

2834b0db4e4bad2956bf51638d1d3f4e7b48f25c