Merge branch 'master' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Mon, 30 Aug 2010 07:28:32 +0000 (09:28 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Mon, 30 Aug 2010 07:28:32 +0000 (09:28 +0200)

Trivial merge