Merge branch 'abigail/for-5.17' into blead
authorAbigail <abigail@abigail.be>
Mon, 26 Mar 2012 15:02:57 +0000 (17:02 +0200)
committerAbigail <abigail@abigail.be>
Mon, 26 Mar 2012 15:02:57 +0000 (17:02 +0200)

Trivial merge