Merge branch 'master' of koala.cs.pub.ro:cs-p2p-next
authorroot p2p-next-02 <root@p2p-next-02.grid.pub.ro>
Fri, 17 Jun 2011 21:48:46 +0000 (00:48 +0300)
committerroot p2p-next-02 <root@p2p-next-02.grid.pub.ro>
Fri, 17 Jun 2011 21:48:46 +0000 (00:48 +0300)

Trivial merge