Merge branch 'replace'
authorRichard Fairhurst <richard@systemeD.net>
Tue, 1 Nov 2011 11:35:56 +0000 (11:35 +0000)
committerRichard Fairhurst <richard@systemeD.net>
Tue, 1 Nov 2011 11:35:56 +0000 (11:35 +0000)

Trivial merge