future merge

[Peter Mazinger]

> 
> 
> On Jul 9, 2011, at 6:08 AM, "Peter Mazinger" <ps.m at gmx.net> wrote:
> 
> > Khem, the master below is unbuildable, fails on epoll.c with your
> config. This epoll.c is the one from master, not mine ;-(
> 
> I mentioned in my email that I did not push the patches that I have on top
> of yours to make it build let me push them today 

copy epoll.c from future branch. 
I could reproduce the failure on future branch as well (with your mips config), will do some checks why this happens

Peter
-- 
NEU: FreePhone - kostenlos mobil telefonieren!			
Jetzt informieren: http://www.gmx.net/de/go/freephone