From: Koen Kooi <koen@openembedded.org>
Date: Fri, 28 Dec 2007 16:37:02 +0000 (+0000)
Subject: merge of '28f5b60141cb1b866dcc89f47a6599c6b64dfbc0'
X-Git-Tag: Release-2010-05/1~8069
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb694ae0d0781bb1e40766c01b58160b77e52791;p=openembedded.git

Merge ... '28f5b60141cb1b866dcc89f47a6599c6b64dfbc0'
     and 'd322189b0c434dffdfdb6b22847f6660c0e95ac6'
---

fb694ae0d0781bb1e40766c01b58160b77e52791