From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Fri, 18 Apr 2008 15:20:19 +0000 (+0000)
Subject: merge of '2aa738d5c03b83a4132b153cc9c9d76b3b367651'
X-Git-Tag: Release-2010-05/1~7172
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=096785ec3979ed50aace999d853bfa089731fc95;p=openembedded.git

Merge ... '2aa738d5c03b83a4132b153cc9c9d76b3b367651'
     and 'c48f66ff9ccc3311bacc8bb4a4c4ed79893a63d4'
---

096785ec3979ed50aace999d853bfa089731fc95