From: Florian Boor <florian.boor@kernelconcepts.de>
Date: Tue, 3 Apr 2007 16:06:34 +0000 (+0000)
Subject: merge of '36aafe8bf796c1a22dbb0f206a98273975012f86'
X-Git-Tag: Release-2010-05/1~8868^2~824
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95c9c953d4dd5650e4bfa8dc93184c2bbae21458;p=openembedded.git

Merge ... '36aafe8bf796c1a22dbb0f206a98273975012f86'
     and '97edb3a78d8b0c88ded6a2d1fc1b78a15c1d5b14'
---

95c9c953d4dd5650e4bfa8dc93184c2bbae21458