Merge branch 'master' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 9 Sep 2010 13:19:28 +0000 (15:19 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Thu, 9 Sep 2010 13:19:28 +0000 (15:19 +0200)

Trivial merge