From: Shane Volpe <shanevolpe@gmail.com>
Date: Mon, 24 Sep 2007 20:54:17 +0000 (+0000)
Subject: merge of '6f95a0eea8bdaf1bc2dddeabb749c0615c9eff8f'
X-Git-Tag: Release-2010-05/1~8609
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e051d29480d110e037515e81fba695a46b61c5cb;p=openembedded.git

Merge ... '6f95a0eea8bdaf1bc2dddeabb749c0615c9eff8f'
     and 'a0edf3d14597e29385c9e7abd78079b45b7b7143'
---

e051d29480d110e037515e81fba695a46b61c5cb