From: Koen Kooi <koen@openembedded.org>
Date: Mon, 2 Jun 2008 21:47:44 +0000 (+0000)
Subject: merge of '190c583e92702619da237578aa0be6d527f7da36'
X-Git-Tag: Release-2010-05/1~6843^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f39dc212d17ba83624d8b5569d61d028a1ef81b;p=openembedded.git

Merge ... '190c583e92702619da237578aa0be6d527f7da36'
     and '9c471eb161aadbb6db3383632fbea28318826a54'
---

6f39dc212d17ba83624d8b5569d61d028a1ef81b