Mon, 16 Jan 2012 18:50:30 +0100 Merge with 492d3c8d776ab2ca1b95e7197f6ba7edeb9c4dec popcorn-port
veltr [Mon, 16 Jan 2012 18:50:30 +0100] rev 656
Merge with 492d3c8d776ab2ca1b95e7197f6ba7edeb9c4dec
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip