Merge remote branch 'immerda/master'
authorintrigeri <intrigeri@boum.org>
Sat, 11 Dec 2010 12:23:23 +0000 (13:23 +0100)
committerintrigeri <intrigeri@boum.org>
Sat, 11 Dec 2010 12:23:23 +0000 (13:23 +0100)

Trivial merge