Merge branch 'bug-418463'
authorSebastian Pipping <sebastian@pipping.org>
Mon, 4 Jun 2012 19:43:10 +0000 (21:43 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Mon, 4 Jun 2012 19:43:10 +0000 (21:43 +0200)
commita4438ec946201eac5fda78f21d7014d4a46ebcdc
tree26a95db9c0059885596da69a0672e7cd85bbc39e
parent21b2c4aab32bf35e9ffa2c215fbeeecfc6a8f1ac
parentaed52e83827cff73e8f7ba5773ea8e0cd7c3c25b
Merge branch 'bug-418463'

Conflicts:
ChangeLog
ChangeLog