From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 1 Nov 2007 11:56:55 +0000 (+0000)
Subject: merge of '2516927691cb7bcdc148fa4797baf97a39ab6b0c'
X-Git-Tag: Release-2010-05/1~8454^2~38
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db770b42eb37918178fe5bbb76435da607d80a7e;p=openembedded.git

Merge ... '2516927691cb7bcdc148fa4797baf97a39ab6b0c'
     and 'e969264b78652c9f002dfe005ae2a8924f4aa450'
---

db770b42eb37918178fe5bbb76435da607d80a7e