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

Merge ... '6eab8aa968a601fef1ab31a6236358e693096ae9'
     and 'dc8de3e0e3155524f86e2184b5e33f5944fdbcc3'
---

8926ba9a4718a4d232c24ccaeea61007f422de12