From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Wed, 20 Jul 2005 17:36:56 +0000 (+0000)
Subject: merge of 6da8c85dc8bb8f2cd343e417a2e33cb7f19c1dda
X-Git-Tag: Release-2010-05/1~9453^2~4110^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdade0602496c2aaad2fb011a124ac65fdb86278;p=openembedded.git

merge of 6da8c85dc8bb8f2cd343e417a2e33cb7f19c1dda
     and a073097d84a515599a3c0d13bd06d0e9cc9beded
---

fdade0602496c2aaad2fb011a124ac65fdb86278