Merge with Sverre's accidental head.
commit50a07f020bdc28ebfed93d60f376ff82faacf46e
authorPawel Solyga <Pawel.Solyga@gmail.com>
Mon, 18 May 2009 12:22:45 +0000 (18 14:22 +0200)
committerPawel Solyga <Pawel.Solyga@gmail.com>
Mon, 18 May 2009 12:22:45 +0000 (18 14:22 +0200)
treefad316c15990d3306e5c3605a10d501e02882f96
parent5734a8d837ecc8693e631ec744704ad6a6a12a78
parent3d69fa7da630d69cd817b02916c29e375e5c393c
Merge with Sverre's accidental head.