From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 2 Aug 2005 15:46:39 +0000 (+0000)
Subject: merge of 0aba4d5c115b944af22e79b2d43f8d1848724fc2
X-Git-Tag: Release-2010-05/1~9453^2~4011^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1d810e915c961d01100a697e9c077328048ffd4;p=openembedded.git

merge of 0aba4d5c115b944af22e79b2d43f8d1848724fc2
     and 1aebe30c46f7b39a3a73dcd30e1227c1a403f1bd
---

e1d810e915c961d01100a697e9c077328048ffd4