Merge branch 'master' into account
authorVincent Zanotti <vincent.zanotti@m4x.org>
Fri, 13 Nov 2009 23:21:02 +0000 (00:21 +0100)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Fri, 13 Nov 2009 23:21:02 +0000 (00:21 +0100)

Trivial merge