Merge branch 'master' of koala.cs.pub.ro:cs-p2p-next
authorroot p2p-next-02 <root@p2p-next-02.grid.pub.ro>
Sun, 7 Aug 2011 10:37:12 +0000 (13:37 +0300)
committerroot p2p-next-02 <root@p2p-next-02.grid.pub.ro>
Sun, 7 Aug 2011 10:37:12 +0000 (13:37 +0300)

Trivial merge