From: Philip Balister <philip@balister.org>
Date: Mon, 27 Aug 2007 21:17:49 +0000 (+0000)
Subject: merge of '610425fd34abfbbedaf9b3792ed2d884bdda9fd3'
X-Git-Tag: Release-2010-05/1~8789^2~5^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5522ece8da310438a9c65aeaa50b86f161540f46;p=openembedded.git

Merge ... '610425fd34abfbbedaf9b3792ed2d884bdda9fd3'
     and '9b318dc0ed758bbc0cbe978a0ff4471831b1df53'
---

5522ece8da310438a9c65aeaa50b86f161540f46