Merge remote branch 'immerda/master'
authorintrigeri <intrigeri@boum.org>
Thu, 16 Dec 2010 12:58:10 +0000 (13:58 +0100)
committerintrigeri <intrigeri@boum.org>
Thu, 16 Dec 2010 12:58:10 +0000 (13:58 +0100)

Trivial merge