From: Koen Kooi <koen@openembedded.org>
Date: Sun, 3 Aug 2008 08:02:24 +0000 (+0000)
Subject: merge of '12e8362ccf0740454595721a242cfb8e867eb512'
X-Git-Tag: Release-2010-05/1~6375^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cedbe2307e9309c1de41a9eaef5876226753017;p=openembedded.git

Merge ... '12e8362ccf0740454595721a242cfb8e867eb512'
     and 'e7f394edea22558fdbcb02929f1540784a5265f2'
---

0cedbe2307e9309c1de41a9eaef5876226753017