From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 4 Dec 2005 20:00:53 +0000 (+0000)
Subject: merge of 63781da032c43575221c98947e7475e3cb577eba
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb72934c0003f40faeceebdca21c4d8de22b0e60;p=openembedded.git

merge of 63781da032c43575221c98947e7475e3cb577eba
     and d638a96a479477de2f205d32492408da8c183085
---

eb72934c0003f40faeceebdca21c4d8de22b0e60