Merge r3302 from sogo.
authorJulien Kerihuel <j.kerihuel@openchange.org>
Fri, 7 Oct 2011 18:05:25 +0000 (18:05 +0000)
committerJulien Kerihuel <j.kerihuel@openchange.org>
Fri, 7 Oct 2011 18:05:25 +0000 (18:05 +0000)

Trivial merge