Merge branch 'master' into install_master
authorAMOS bot <amosbot@host4.mediatouch.it>
Mon, 26 Sep 2011 00:55:27 +0000 (00:55 +0000)
committerAMOS bot <amosbot@host4.mediatouch.it>
Mon, 26 Sep 2011 00:55:27 +0000 (00:55 +0000)

Trivial merge