From: Paul Eggleton <bluelightning@bluelightning.org>
Date: Sun, 21 Sep 2008 13:56:33 +0000 (+0000)
Subject: merge of '2164eb62b60f233738ed0300039cc4c534e16a14'
X-Git-Tag: Release-2010-05/1~6013^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1e1a2e1738d4f5a9d8ee8f895c2525f1b37edee;p=openembedded.git

Merge ... '2164eb62b60f233738ed0300039cc4c534e16a14'
     and 'e330aca99df7101ab377267e761f56c0df7ef4ae'
---

a1e1a2e1738d4f5a9d8ee8f895c2525f1b37edee