Merge branch 'master' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 27 Aug 2010 08:51:26 +0000 (10:51 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 27 Aug 2010 08:51:26 +0000 (10:51 +0200)

Trivial merge