Merge branch 'master' into view-refactor
authorzuber <marek@stepniowski.com>
Sun, 27 Sep 2009 11:19:14 +0000 (13:19 +0200)
committerzuber <marek@stepniowski.com>
Sun, 27 Sep 2009 11:19:14 +0000 (13:19 +0200)

Trivial merge