From: Jamie Lenehan <lenehan@twibble.org>
Date: Mon, 11 Sep 2006 08:30:04 +0000 (+0000)
Subject: merge of '0edc1768de060a67dac5f890607917c6fc071afb'
X-Git-Tag: Release-2010-05/1~9453^2~843^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12907c8d2fdf961b2ce17a80830fa12fdb3d827d;p=openembedded.git

Merge ... '0edc1768de060a67dac5f890607917c6fc071afb'
     and '97ba2f7d5ed2933671887798c86f26a5e86dac86'
---

12907c8d2fdf961b2ce17a80830fa12fdb3d827d