Merge remote branch 'remotes/origin/master'
authorAnonymous <anonymous@none>
Tue, 26 Oct 2010 15:57:58 +0000 (17:57 +0200)
committerAnonymous <anonymous@none>
Tue, 26 Oct 2010 15:57:58 +0000 (17:57 +0200)

Trivial merge