Merge branch 'tie-scalar' into blead
authorAbigail <abigail@abigail.be>
Sun, 21 Feb 2010 16:28:39 +0000 (17:28 +0100)
committerAbigail <abigail@abigail.be>
Sun, 21 Feb 2010 16:28:39 +0000 (17:28 +0100)

Trivial merge