From: David Karlstrom <daka@thg.se>
Date: Sun, 24 Jul 2005 22:50:25 +0000 (+0000)
Subject: merge of 5bbc6ec4525557db317977a31210230c82e55137
X-Git-Tag: Release-2010-05/1~9453^2~4055^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8ad3ab8ac0ac1cc8e01b30d91e9ced5ed503c77;p=openembedded.git

merge of 5bbc6ec4525557db317977a31210230c82e55137
     and 784c05071a5b5065bf80e4deffcb6d20b1aef040
---

b8ad3ab8ac0ac1cc8e01b30d91e9ced5ed503c77