Merge remote branch 'kc/new/bug_5227' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 4 Nov 2010 19:02:34 +0000 (08:02 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 4 Nov 2010 19:02:34 +0000 (08:02 +1300)
commitb2fa851ccaca0d61d5de6c35752d368f540fb02e
tree7b3927ee65a2ebe88de7aff89cd50a6505752bbb
parent414b2ace4fa5804d27e927b9b573dcb973761c87
parenta1229d29b812e2be37cca54ddf0ababe737ed980
Merge remote branch 'kc/new/bug_5227' into kcmaster