From: Philip Balister <philip@balister.org>
Date: Fri, 17 Aug 2007 14:15:36 +0000 (+0000)
Subject: merge of '251ce0b2ecef56298add803931ece23020b55b51'
X-Git-Tag: Release-2010-05/1~8939^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e63ef2fb978ab59c024777e5b05431b9fd4ff790;p=openembedded.git

Merge ... '251ce0b2ecef56298add803931ece23020b55b51'
     and '56cb1415ef08dcd2f7d216443fc4cff7c06548fa'
---

e63ef2fb978ab59c024777e5b05431b9fd4ff790