From: Shane Volpe <shanevolpe@gmail.com>
Date: Mon, 24 Sep 2007 21:23:35 +0000 (+0000)
Subject: merge of '833cc8c93eb7837c6f2fc140dcde5d238ed342b3'
X-Git-Tag: Release-2010-05/1~8608
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ff08937024c9c0220e005b88dbe5c05f46e0d89;p=openembedded.git

Merge ... '833cc8c93eb7837c6f2fc140dcde5d238ed342b3'
     and '8cab20c14fd2e521e04d0f06c4802f4d9cd4832f'
---

1ff08937024c9c0220e005b88dbe5c05f46e0d89