From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 9 Jul 2005 13:34:15 +0000 (+0000)
Subject: merge of 20102c595555b6f10738ef4a8f639e4f90345415
X-Git-Tag: Release-2010-05/1~9453^2~4206
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb3a0cd64987084fa719eebca83b38c879ecd224;p=openembedded.git

merge of 20102c595555b6f10738ef4a8f639e4f90345415
     and 841f6095e2634754c040515b151d9b5e84e3dcb8
---

cb3a0cd64987084fa719eebca83b38c879ecd224