From: Koen Kooi <koen@openembedded.org>
Date: Sat, 16 Jun 2007 10:57:15 +0000 (+0000)
Subject: merge of '1f133cbc99d6821edfd7e22579fd164020999cb9'
X-Git-Tag: Release-2010-05/1~8868^2~373
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f857c1379e692764f3f3ac07b6a41e092d51fa2c;p=openembedded.git

Merge ... '1f133cbc99d6821edfd7e22579fd164020999cb9'
     and '92e57ebaabc8dbb36757843dbe6e0e2bdc042b87'
---

f857c1379e692764f3f3ac07b6a41e092d51fa2c