Merge branch 'bug-351906'
authorSebastian Pipping <sebastian@pipping.org>
Thu, 20 Jan 2011 14:21:43 +0000 (15:21 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Thu, 20 Jan 2011 14:21:43 +0000 (15:21 +0100)
commitf0142b1d12ee775f307f6eb3e8a60161eba3d679
treee73a3adc7d14ab1665ef41ca316fffad91b878d3
parentc0876b0972827305e160a91c6a3e34910181e254
parent0baf1d36fb5aae346ea14e70e68ec98e5de71dc2
Merge branch 'bug-351906'

Conflicts:
ChangeLog
ChangeLog