Merge remote-tracking branch 'kc/new/bug_6312' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 15 May 2011 08:38:00 +0000 (20:38 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 15 May 2011 08:38:00 +0000 (20:38 +1200)
commita9576a50887057b9094be6fe17bfc3207c2fce79
tree71367ecbf096a36fcec8e3c38a608cb67ef0a266
parentc87e872278f890cf1a9ab17583431f60786cb566
parentcec59e7ea0dd3101031fbe916f6e207d212793b4
Merge remote-tracking branch 'kc/new/bug_6312' into kcmaster