From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 29 Sep 2006 20:33:45 +0000 (+0000)
Subject: merge of '1413d095164c683305cfc29d3e275c6cd0aff5c2'
X-Git-Tag: Release-2010-05/1~9453^2~666^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3123faca484adb68e0bb77de716b00024a82f086;p=openembedded.git

Merge ... '1413d095164c683305cfc29d3e275c6cd0aff5c2'
     and 'c08c1b4bb94a697cdae713e266562bb43944ba77'
---

3123faca484adb68e0bb77de716b00024a82f086