Merge remote-tracking branch 'kc/new/bug_6726' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 26 Aug 2011 03:01:09 +0000 (15:01 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 26 Aug 2011 03:01:09 +0000 (15:01 +1200)
commit1e395ff152f1c8801500e719e19b4761781e653f
tree9894b9ebdc091406867e86a4ce61af119eb5e320
parent9c346e25269ada0b3fa5f5a6934986970c6b9a9f
parent666a2316d8adbd8fadba263c42dba71fe992532c
Merge remote-tracking branch 'kc/new/bug_6726' into kcmaster