From: Shane Volpe <shanevolpe@gmail.com>
Date: Sun, 17 Aug 2008 16:10:48 +0000 (+0000)
Subject: merge of '821c171dc12f1dfb462905df87a80fa08a36f23c'
X-Git-Tag: Release-2010-05/1~6330^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da2ede960f123f52487a793092b75add3218e051;p=openembedded.git

Merge ... '821c171dc12f1dfb462905df87a80fa08a36f23c'
     and 'd8c6e59221578f1b5287630d26b4cb9216ef5e4c'
---

da2ede960f123f52487a793092b75add3218e051