From: Koen Kooi <koen@openembedded.org>
Date: Sat, 14 Jun 2008 16:54:57 +0000 (+0000)
Subject: merge of '81ce749b8f57a5a56ca3f31c843da1b227a8a48d'
X-Git-Tag: Release-2010-05/1~6691^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e14c89c8ecad2dc17a2e0efbdf24dacb690ff41;p=openembedded.git

Merge ... '81ce749b8f57a5a56ca3f31c843da1b227a8a48d'
     and 'e21e6187b919035f20b69c9c2a3c8f43e345d930'
---

6e14c89c8ecad2dc17a2e0efbdf24dacb690ff41