From: Philip Balister <philip@balister.org>
Date: Thu, 26 Jun 2008 14:28:18 +0000 (+0000)
Subject: merge of 'a1c5133ec8dfc7768c8883c8aa89593ce01f57cb'
X-Git-Tag: Release-2010-05/1~6619
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ed0deaac092272dfa5206a227e30adc8efd4f88;p=openembedded.git

Merge ... 'a1c5133ec8dfc7768c8883c8aa89593ce01f57cb'
     and 'fb432a3c848fb8f9a30c288a565d9490a1d9b318'
---

1ed0deaac092272dfa5206a227e30adc8efd4f88