merge of 013572ec4e1d77ecdc8721416e81afacf5d19b05
authorOyvind Repvik <nail@nslu2-linux.org>
Mon, 19 Jun 2006 03:19:15 +0000 (03:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Jun 2006 03:19:15 +0000 (03:19 +0000)
     and 7309517bd7e28306f85628aae0a013347f742df7


Trivial merge