Merge branch 'master' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Wed, 22 Sep 2010 06:34:42 +0000 (08:34 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Wed, 22 Sep 2010 06:34:42 +0000 (08:34 +0200)

Trivial merge