From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 17 Dec 2006 10:52:36 +0000 (+0000)
Subject: merge of '1cdff1496ac2d8d1eb68e3762f5ac4fd53c20924'
X-Git-Tag: Release-2010-05/1~9453^2~129^2~14^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db8fb05c672025788cac42c01fd30145de0119cc;p=openembedded.git

Merge ... '1cdff1496ac2d8d1eb68e3762f5ac4fd53c20924'
     and 'af1d7cf6768b5e5205f07a7a63b6767971ccb1b7'
---

db8fb05c672025788cac42c01fd30145de0119cc