From: Matt Reimer <mattjreimer@gmail.com>
Date: Mon, 13 Nov 2006 19:19:49 +0000 (+0000)
Subject: merge of '440352b74d1975abf361c30e00a2519bd5c8051e'
X-Git-Tag: Release-2010-05/1~9455^2~495^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe6bc5b4cabb5fcf87b8944b4cfbe73bb48ceecf;p=openembedded.git

Merge ... '440352b74d1975abf361c30e00a2519bd5c8051e'
     and '493bfe4db4e2664b2f5a442c4973208d987e2752'
---

fe6bc5b4cabb5fcf87b8944b4cfbe73bb48ceecf