Merge branch 'replica_ft' of charmgit:charm into replica_ft
authorXiang Ni <xiangni@hopper09.(none)>
Sun, 30 Dec 2012 01:53:25 +0000 (17:53 -0800)
committerXiang Ni <xiangni@hopper09.(none)>
Sun, 30 Dec 2012 01:53:25 +0000 (17:53 -0800)

Trivial merge