From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Mon, 19 Jun 2006 21:33:47 +0000 (+0000)
Subject: merge of 67ad681c17b58ee0ff1e672b4aa634ab523a9e11
X-Git-Tag: Release-2010-05/1~9453^2~1429^2~17^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8aaeca2ad195be3be0bde2ffccf371184d00a70;p=openembedded.git

merge of 67ad681c17b58ee0ff1e672b4aa634ab523a9e11
     and f964e908fbdc16f8a354efde04a6cd7a81ce0a6a
---

d8aaeca2ad195be3be0bde2ffccf371184d00a70