news: sync with branch-1.11, fix mis-merges
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 28 Mar 2012 13:36:30 +0000 (15:36 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 28 Mar 2012 13:36:30 +0000 (15:36 +0200)
commit2e343fc7c69cee628a83759edc33f336eedfa1d0
treee038d82d73619ae65af3aeff8b22cbd5feee3a2e
parent3856a9405a7c76348b4e5a23a223ca7f7e4a8735
news: sync with branch-1.11, fix mis-merges

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
NEWS