From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Wed, 27 Jun 2007 03:11:08 +0000 (+0000)
Subject: merge of '3138c13a7a9b08f8cfb5650c96e544ad82b3b84a'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe8a092442c3fff0ff1ec2e82a5880c7cc11b5fa;p=openembedded.git

Merge ... '3138c13a7a9b08f8cfb5650c96e544ad82b3b84a'
     and '4c78f5500334d26f8fcbdeda6f4a013b43269e86'
---

fe8a092442c3fff0ff1ec2e82a5880c7cc11b5fa