From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Fri, 23 May 2008 20:34:16 +0000 (+0000)
Subject: merge of '51c8bec079d3bd6ef15c2674a76e2fd007e47122'
X-Git-Tag: Release-2010-05/1~6876
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=993d0b41039102ea8a645f333af97a71549ef3e3;p=openembedded.git

Merge ... '51c8bec079d3bd6ef15c2674a76e2fd007e47122'
     and 'a4c7fdea302dedfc9dc32cbc08963aabe21f38b8'
---

993d0b41039102ea8a645f333af97a71549ef3e3