From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Mon, 6 Aug 2007 15:20:20 +0000 (+0000)
Subject: merge of '96bb64a3731e126f99a327d5a0e1146bddcc95e0'
X-Git-Tag: Release-2010-05/1~8868^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=536be8a5c6846d5ff1fc4eb43bff0c04928deb57;p=openembedded.git

Merge ... '96bb64a3731e126f99a327d5a0e1146bddcc95e0'
     and 'e12a3eaad302fcad2de2f62fbf765f1058f626cd'
---

536be8a5c6846d5ff1fc4eb43bff0c04928deb57