From: Philip Balister <philip@balister.org>
Date: Tue, 14 Aug 2007 21:39:30 +0000 (+0000)
Subject: merge of '0931cbd64db6d6e9a567bada1dd3b5bfd9362192'
X-Git-Tag: Release-2010-05/1~8967^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e2c1dfd93f645edc7aeb5a9ed842fedbe5f4436;p=openembedded.git

Merge ... '0931cbd64db6d6e9a567bada1dd3b5bfd9362192'
     and '55a6d6c3852b2ced2a7f078fa495586c25a3a8e7'
---

0e2c1dfd93f645edc7aeb5a9ed842fedbe5f4436