From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 25 Oct 2007 12:48:48 +0000 (+0000)
Subject: merge of '56ceab0da14ebf9acac5e367a5e2300e7da4882f'
X-Git-Tag: Release-2010-05/1~8454^2~132
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=887638896b30cd32ac192b4b4d4c2db4b4ac1a7b;p=openembedded.git

Merge ... '56ceab0da14ebf9acac5e367a5e2300e7da4882f'
     and '9235652d1f961fc07ff7bc1997a38323e8c46039'
---

887638896b30cd32ac192b4b4d4c2db4b4ac1a7b