Merge remote branch 'immerda/master'
authorintrigeri <intrigeri@boum.org>
Fri, 25 Feb 2011 23:25:57 +0000 (00:25 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 25 Feb 2011 23:25:57 +0000 (00:25 +0100)

Trivial merge