From: Koen Kooi <koen@openembedded.org>
Date: Thu, 30 Aug 2007 12:51:14 +0000 (+0000)
Subject: merge of '06fb345943334f939a5210e3a0e3c6d4edf0e6c1'
X-Git-Tag: Release-2010-05/1~8776^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=634f80151cba377aedff02a302f44eaa5b52af7c;p=openembedded.git

Merge ... '06fb345943334f939a5210e3a0e3c6d4edf0e6c1'
     and 'f4febba2a3678a4948cda4320c543ed34a41ff68'
---

634f80151cba377aedff02a302f44eaa5b52af7c