From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 2 Jan 2007 03:25:55 +0000 (+0000)
Subject: merge of 'bcaae16b49f72fbc56e2ec7aa8633d3f55b36d2f'
X-Git-Tag: Release-2010-05/1~9453^2~37
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2d109374486bca20786090da2601a2bdd1356ef;p=openembedded.git

Merge ... 'bcaae16b49f72fbc56e2ec7aa8633d3f55b36d2f'
     and 'dc166a634d98eed0d4db914b9baa853e0041ee57'
---

f2d109374486bca20786090da2601a2bdd1356ef