Merge remote-tracking branch 'kc/new/bug_6253' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 19 Oct 2011 20:23:36 +0000 (09:23 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 19 Oct 2011 20:23:36 +0000 (09:23 +1300)
commitd80c3369d202617a1e7b4ce87b7dcc39a308a8d5
tree944e84c66cf752629bc3fcb87d6e5aa5ebcc2f32
parent8935132c5d73eeb716fd269dcf69c61998b9177d
parentd80cf35e9ba39112bfdefc3ce6ba8ddae121347c
Merge remote-tracking branch 'kc/new/bug_6253' into kcmaster