From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sat, 11 Mar 2006 20:36:44 +0000 (+0000)
Subject: merge of 5de21ce1146b76cf25440eddc66aaa8a9a984df9
X-Git-Tag: Release-2010-05/1~9453^2~2237
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c54806e853b63e1d43e1dc1fc1ac5413ffb52ac2;p=openembedded.git

merge of 5de21ce1146b76cf25440eddc66aaa8a9a984df9
     and dfcb7791f0a796aab00f40b7918a67f5022f1d07
---

c54806e853b63e1d43e1dc1fc1ac5413ffb52ac2