From: Koen Kooi <koen@openembedded.org>
Date: Sat, 6 Sep 2008 22:41:05 +0000 (+0000)
Subject: merge of '758d1f4ff547286aef7de856b87ca0bd9f743c4c'
X-Git-Tag: Release-2010-05/1~6141^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77d22b463d3fc3982db26d7e8d54ce3df9989077;p=openembedded.git

Merge ... '758d1f4ff547286aef7de856b87ca0bd9f743c4c'
     and 'ba02b39ad05fe330967acb43ee7ac802b7fd24b3'
---

77d22b463d3fc3982db26d7e8d54ce3df9989077