From: Philip Balister <philip@balister.org>
Date: Sun, 26 Aug 2007 11:30:52 +0000 (+0000)
Subject: merge of '1eb402d65c65c017f7fabfc389de63084c25dfc6'
X-Git-Tag: Release-2010-05/1~8789^2~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b646369bb9a646f2c3ef6e2057fca86189a7bb10;p=openembedded.git

Merge ... '1eb402d65c65c017f7fabfc389de63084c25dfc6'
     and 'ae2a216bbda2ece2aa59f605c5345f7c13121c4e'
---

b646369bb9a646f2c3ef6e2057fca86189a7bb10