Merge remote-tracking branch 'kc/new/bug_6497' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 19 Jun 2011 10:14:15 +0000 (22:14 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 19 Jun 2011 10:14:15 +0000 (22:14 +1200)
commitc78608483e113c9a66fc8ae90459628b9dae5f44
treeca80841483b0b64f6a907d464d0ccea1ccbab70c
parent126d6247b28f7655cc77d0727c0bb11c23950b90
parent59ac64db973b3a0f4cebd6c5933c4f78bf0dbc2e
Merge remote-tracking branch 'kc/new/bug_6497' into kcmaster