From: Martin Mares <mj@ucw.cz>
Date: Sat, 28 Mar 2009 13:08:14 +0000 (+0100)
Subject: Merge branch 'layout'
X-Git-Tag: python-dummy-working~110^2~5
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Flayout;p=moe.git

Merge branch 'layout'
---

30c7aff241814c9e99ff3c1521ac40b3d5c721d3