From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 5 Nov 2005 16:09:03 +0000 (+0000)
Subject: merge of 24f6b65766e0de225c683f9ad48a63ee1a2cf779
X-Git-Tag: Release-2010-05/1~9453^2~3128
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b57976ec426fe3606acce1ffbf4352dc05d20af3;p=openembedded.git

merge of 24f6b65766e0de225c683f9ad48a63ee1a2cf779
     and 680976b94fa3d2c3b2a4dcb5043cfd5e27b05993
---

b57976ec426fe3606acce1ffbf4352dc05d20af3