merge
authorTomas Musil <tomik.musil@gmail.com>
Mon, 2 Apr 2012 13:28:47 +0000 (15:28 +0200)
committerTomas Musil <tomik.musil@gmail.com>
Mon, 2 Apr 2012 13:32:29 +0000 (15:32 +0200)

Trivial merge