Merge branch 'master' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Mon, 20 Sep 2010 12:42:49 +0000 (14:42 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Mon, 20 Sep 2010 12:42:49 +0000 (14:42 +0200)

Trivial merge