Merge branch 'master' into view-refactor
authorzuber <marek@stepniowski.com>
Sat, 26 Sep 2009 19:14:49 +0000 (21:14 +0200)
committerzuber <marek@stepniowski.com>
Sat, 26 Sep 2009 19:14:49 +0000 (21:14 +0200)

Trivial merge