From: Justin Patrin <papercrane@gmail.com>
Date: Sun, 21 Jan 2007 20:35:02 +0000 (+0000)
Subject: merge of '98112dc48d05ba36117d1045ed0b25ac449d5c7f'
X-Git-Tag: Release-2010-05/1~9354
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=725b31633b9944eec4c081f1edad620607ce5c5d;p=openembedded.git

Merge ... '98112dc48d05ba36117d1045ed0b25ac449d5c7f'
     and 'a6d3725bcd7849f3044d01c9bfa2c73dd96dfe89'
---

725b31633b9944eec4c081f1edad620607ce5c5d