Merge branch 'master' of p2p-next@koala.cs.pub.ro:cs-p2p-next
authorAdriana Draghici <adriana008@gmail.com>
Wed, 28 Oct 2009 12:49:40 +0000 (14:49 +0200)
committerAdriana Draghici <adriana008@gmail.com>
Wed, 28 Oct 2009 12:49:40 +0000 (14:49 +0200)

Trivial merge