From: Philip Balister <philip@balister.org>
Date: Sun, 23 Sep 2007 20:55:38 +0000 (+0000)
Subject: merge of '925ef46f820e0b0c4654698e3a371bb2c3b5b29d'
X-Git-Tag: Release-2010-05/1~8620
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f58ad30201f63489b7fe35c74e823236c14f8bd9;p=openembedded.git

Merge ... '925ef46f820e0b0c4654698e3a371bb2c3b5b29d'
     and 'f7f0fdf64cf2ec9da66c3fbed96fe99609073461'
---

f58ad30201f63489b7fe35c74e823236c14f8bd9