Tue, 05 Jun 2012 16:44:38 +0200 one more merge with trunk
Nikita Kozlov <nikita@elyzion.net> [Tue, 05 Jun 2012 16:44:38 +0200] rev 1004
one more merge with trunk
(0) -1000 -300 -100 -30 -10 -1 +1 tip