From: Philip Balister <philip@balister.org>
Date: Tue, 12 Aug 2008 23:43:44 +0000 (+0000)
Subject: merge of '2a6a15e0a08e8a808d409d6dcd8af1d5db6de4cd'
X-Git-Tag: Release-2010-05/1~6333^2~13^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8556f25202ad225bc643e1f4c0abd3ced33e578b;p=openembedded.git

Merge ... '2a6a15e0a08e8a808d409d6dcd8af1d5db6de4cd'
     and 'e50fc707da1372d68e46edaf3a6915bf53f628b9'
---

8556f25202ad225bc643e1f4c0abd3ced33e578b