From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 3 Aug 2008 02:32:51 +0000 (+0000)
Subject: merge of '696f3c5e555284edab7d8cdb02487889a270786b'
X-Git-Tag: Release-2010-05/1~6375^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=548ccfae20cd67ff3bff8455efb8612ba904ef97;p=openembedded.git

Merge ... '696f3c5e555284edab7d8cdb02487889a270786b'
     and 'b701ffba40ab76cb5b74d4e7415eca78071755bb'
---

548ccfae20cd67ff3bff8455efb8612ba904ef97