Merge remote-tracking branch 'kc/new/awaiting_qa/bug_6316' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 4 Aug 2011 22:21:20 +0000 (10:21 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 4 Aug 2011 22:21:20 +0000 (10:21 +1200)
commitd8a36ca1f80460029ec5442fb1bf5de8b00a2138
tree9826eb881c7110e4a25edd3d738940225a0ee0ba
parent0fff79d6b464eb9e053ed568234e43695fbec66b
parent9fd4ff61d81b62b0e9aba536a382e61134f54b03
Merge remote-tracking branch 'kc/new/awaiting_qa/bug_6316' into kcmaster