Merge branch 'master' into cache
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 20 Aug 2010 10:44:57 +0000 (12:44 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 20 Aug 2010 10:44:57 +0000 (12:44 +0200)

Trivial merge