From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 27 Jan 2007 19:09:28 +0000 (+0000)
Subject: merge of '4c6648cc891f04859672dcba49bb1bb243e2340d'
X-Git-Tag: Release-2010-05/1~9332^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5425c3b212ca2237b7fc79bfce79d36644927834;p=openembedded.git

Merge ... '4c6648cc891f04859672dcba49bb1bb243e2340d'
     and '95c991e65f8c2e790e4cc2627adee6399cef945f'
---

5425c3b212ca2237b7fc79bfce79d36644927834