From: Jamie Lenehan <lenehan@twibble.org>
Date: Thu, 14 Sep 2006 05:33:23 +0000 (+0000)
Subject: merge of 'a6eee320d19a51be84a742cc6dcbf630b384272e'
X-Git-Tag: Release-2010-05/1~9453^2~821
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a70c6d6eb57a0cd7f723460fd0332e6e9b6528b1;p=openembedded.git

Merge ... 'a6eee320d19a51be84a742cc6dcbf630b384272e'
     and 'c6382b7d167b58ac0d7a80b4a402a6aadc42c954'
---

a70c6d6eb57a0cd7f723460fd0332e6e9b6528b1