Merge branch 'master' of chrome:/home/git/doc
authorroot <root@conny.andreamanni.com>
Fri, 5 Feb 2010 23:31:49 +0000 (00:31 +0100)
committerroot <root@conny.andreamanni.com>
Fri, 5 Feb 2010 23:31:49 +0000 (00:31 +0100)

Trivial merge