From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Wed, 25 Oct 2006 23:27:19 +0000 (+0000)
Subject: merge of 5d13f311dd93df73db461d6abca7480b39bbecbc
X-Git-Tag: Release-2010-05/1~9453^2~581
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e26108affb65e89fcf248a58564b9c25934a04a0;p=openembedded.git

merge of 5d13f311dd93df73db461d6abca7480b39bbecbc
     and 6bdfd4680fb56e499b8a254034efb752dead5002
---

e26108affb65e89fcf248a58564b9c25934a04a0