Merge branch 'master' into xdxf
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 6 Aug 2010 12:13:05 +0000 (14:13 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 6 Aug 2010 12:13:05 +0000 (14:13 +0200)

Trivial merge