Merge branch 'master' into lqc-trunk
authorLukasz Rekucki <lrekucki@gmail.com>
Fri, 30 Oct 2009 23:25:06 +0000 (00:25 +0100)
committerLukasz Rekucki <lrekucki@gmail.com>
Fri, 30 Oct 2009 23:25:06 +0000 (00:25 +0100)

Trivial merge