From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 2 Jan 2007 01:17:58 +0000 (+0000)
Subject: merge of 399a28c52fc147b1a3218c47622126f864b2e129
X-Git-Tag: Release-2010-05/1~9453^2~35^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08bcbcc5a29d50a8a7e4a7575930016a29493f49;p=openembedded.git

merge of 399a28c52fc147b1a3218c47622126f864b2e129
     and bcaae16b49f72fbc56e2ec7aa8633d3f55b36d2f
---

08bcbcc5a29d50a8a7e4a7575930016a29493f49