From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 22 Jan 2006 12:00:56 +0000 (+0000)
Subject: merge of 897657fc95b12ea51abbdcb9bb8828bfa5a1caca
X-Git-Tag: Release-2010-05/1~9453^2~2590
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5a2a12f50424ad15585513e40da17c5b3e613c5;p=openembedded.git

merge of 897657fc95b12ea51abbdcb9bb8828bfa5a1caca
     and bf04667bfe2d9cedd68fc1f220beacb16eccdbf9
---

b5a2a12f50424ad15585513e40da17c5b3e613c5