From: Philip Balister <philip@balister.org>
Date: Sun, 12 Aug 2007 15:28:32 +0000 (+0000)
Subject: merge of '3f2a27262036d4f6ceb75b07aa81c14e4b0fdcf0'
X-Git-Tag: Release-2010-05/1~9004
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7b1482b15c6b2848ff392cef00c420a8f8927e1;p=openembedded.git

Merge ... '3f2a27262036d4f6ceb75b07aa81c14e4b0fdcf0'
     and '6b3dffb49893e57cc4d29e223fbea38df4937659'
---

a7b1482b15c6b2848ff392cef00c420a8f8927e1