From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 8 Aug 2007 17:55:14 +0000 (+0000)
Subject: merge of '70aa18fe06d3e3a4ad005666e02d3c53f91a5fa1'
X-Git-Tag: Release-2010-05/1~9076^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23565dca658348d15acb9fc272be7d9e8d28a6e2;p=openembedded.git

Merge ... '70aa18fe06d3e3a4ad005666e02d3c53f91a5fa1'
     and '9337a5ff3440772705d464c123d99b9bcbe72cd0'
---

23565dca658348d15acb9fc272be7d9e8d28a6e2