From: Koen Kooi <koen@openembedded.org>
Date: Sat, 20 Oct 2007 15:48:20 +0000 (+0000)
Subject: merge of '76afa3fd7e5ab1e782da555eb4e4d888551a37c6'
X-Git-Tag: Release-2010-05/1~7838^2~16^2~2^2^2^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d1a88a02aef8574d73d0a725e1df65d0549a83b;p=openembedded.git

Merge ... '76afa3fd7e5ab1e782da555eb4e4d888551a37c6'
     and 'fe4e349c9f99ffcc18a5abe8041cd3379219c456'
---

5d1a88a02aef8574d73d0a725e1df65d0549a83b