From: Koen Kooi <koen@openembedded.org>
Date: Sun, 13 Apr 2008 12:29:49 +0000 (+0000)
Subject: merge of '92c05bc0b6ee1645537e1189be26b9962a1c5170'
X-Git-Tag: Release-2010-05/1~7200
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc4d88e6614cb224048077480e5f8e57436ac50b;p=openembedded.git

Merge ... '92c05bc0b6ee1645537e1189be26b9962a1c5170'
     and 'b4c276c777f8614628c038c3f75fb35493df20b7'
---

dc4d88e6614cb224048077480e5f8e57436ac50b