Merge remote-tracking branch 'kc/new/awaiting_qa/bug_6316' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 4 Aug 2011 21:37:49 +0000 (09:37 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 4 Aug 2011 21:37:49 +0000 (09:37 +1200)
commit0fff79d6b464eb9e053ed568234e43695fbec66b
treebf2999b6df8d7ea1801e9db9ed0b71f025b297a0
parent2c88e1e0f8b9422121edd30ff54494085eaf87eb
parenta07127c5ac79ece2496dae30d366ab4610983d48
Merge remote-tracking branch 'kc/new/awaiting_qa/bug_6316' into kcmaster