Merge remote-tracking branch 'kc/new/bug_5234' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 13 Sep 2011 20:46:05 +0000 (08:46 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 13 Sep 2011 20:46:05 +0000 (08:46 +1200)
commitf8bd9b146076c9620d34a45fed41e4c069e96c32
treeba113f728d3041e31f5477fc5ffc284168fcaee8
parentaf9ac2fb57d07cef95fc97e3269e844ce7431ed1
parent2d4d976f3dd5e9b36784562a02da25ae04122d86
Merge remote-tracking branch 'kc/new/bug_5234' into kcmaster