From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 2 Aug 2008 19:21:00 +0000 (+0000)
Subject: merge of '0af36442f2b5ad5f505d802f19a109562afaee66'
X-Git-Tag: Release-2010-05/1~6375^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d0c9efffa61b8aaf14998c40857f6242835e43c;p=openembedded.git

Merge ... '0af36442f2b5ad5f505d802f19a109562afaee66'
     and 'ef96b95bd9637cbe10bcca0129b560159fdedafb'
---

6d0c9efffa61b8aaf14998c40857f6242835e43c