From: Shane Volpe <shanevolpe@gmail.com>
Date: Wed, 20 Aug 2008 03:17:14 +0000 (+0000)
Subject: merge of '45717dd378e89bf7ba418cac08db57a5e7a55474'
X-Git-Tag: Release-2010-05/1~6305^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ded4587ed4991a79c1e5d433bf4d5c5b3bdf65f8;p=openembedded.git

Merge ... '45717dd378e89bf7ba418cac08db57a5e7a55474'
     and '89b3663402c864c49ce19e33bca2ae6a059b54f9'
---

ded4587ed4991a79c1e5d433bf4d5c5b3bdf65f8