Merge branch 'master' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 1 Oct 2010 10:50:59 +0000 (12:50 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 1 Oct 2010 10:50:59 +0000 (12:50 +0200)

Trivial merge