From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Sun, 3 Jul 2005 15:50:32 +0000 (+0000)
Subject: merge of e1a4a6a54101a12142258575aaa1bcea126adbcb
X-Git-Tag: Release-2010-05/1~9453^2~4252
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be942b01f9338e0d07a8c239f5c1b7c17b92ac54;p=openembedded.git

merge of e1a4a6a54101a12142258575aaa1bcea126adbcb
     and 9b0371bf5547d5dcea1bcd07f29bc1aceefcdd98
---

be942b01f9338e0d07a8c239f5c1b7c17b92ac54