Merge remote-tracking branch 'kc/new/bug_2505' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 11 Jul 2011 09:09:25 +0000 (21:09 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 11 Jul 2011 09:09:25 +0000 (21:09 +1200)
commit1d0bdecd4b04031821d7670abf5d51d6a0e83c4c
tree870d6d6f386332e082e2de105cbe0408599c3c32
parentafe52ddc907488c99b065463f1b3156f7757a3da
parentffa86e29b5d97aa02985700aaaf25432cc9464e8
Merge remote-tracking branch 'kc/new/bug_2505' into kcmaster