From: Philip Balister <philip@balister.org>
Date: Mon, 17 Sep 2007 19:07:31 +0000 (+0000)
Subject: merge of '334f1ee81c31102eb71d125911c2b1de3f3804d2'
X-Git-Tag: Release-2010-05/1~8625^2~65^2~4^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea1c418b23870f7d25918d46c370e9d21746a05c;p=openembedded.git

Merge ... '334f1ee81c31102eb71d125911c2b1de3f3804d2'
     and 'e9a6786ef2e7a6c087283a96dd0a224bae8a9927'
---

ea1c418b23870f7d25918d46c370e9d21746a05c