From: Shane Volpe <shanevolpe@gmail.com>
Date: Tue, 19 Aug 2008 16:26:27 +0000 (+0000)
Subject: merge of 'a5859fe0a66f4405c36b46c66e759ad901a4bcf8'
X-Git-Tag: Release-2010-05/1~6319
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=baf8d26c428809d0afe74fb2e6fcde9234a54808;p=openembedded.git

Merge ... 'a5859fe0a66f4405c36b46c66e759ad901a4bcf8'
     and 'bdef4ea2bcf85f3f2f7fe0f86441076fa860c5bc'
---

baf8d26c428809d0afe74fb2e6fcde9234a54808