Merge remote-tracking branch 'oblomov/liquid_fixes'
authorPerttu Ahola <celeron55@gmail.com>
Mon, 22 Aug 2011 09:53:18 +0000 (12:53 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Mon, 22 Aug 2011 09:53:18 +0000 (12:53 +0300)

Trivial merge