From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 21 Aug 2008 09:14:08 +0000 (+0000)
Subject: merge of '569e7d088bd81d3c7c545ac39e6e807ab3b47b36'
X-Git-Tag: Release-2010-05/1~6306^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c8d53ab6227c68382e5eb657fb8507c7e4c1684;p=openembedded.git

Merge ... '569e7d088bd81d3c7c545ac39e6e807ab3b47b36'
     and '805051d6b47931aa94c5c0cecd79401e04fd7b45'
---

2c8d53ab6227c68382e5eb657fb8507c7e4c1684