fixed trivial conflicts
authorMatteo Nastasi (mop) <nastasi@alternativeoutput.com>
Wed, 25 Apr 2012 14:50:25 +0000 (16:50 +0200)
committerMatteo Nastasi (mop) <nastasi@alternativeoutput.com>
Wed, 25 Apr 2012 14:50:25 +0000 (16:50 +0200)

Trivial merge