Merge remote branch 'kc/new/bug_5804' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 2 Mar 2011 23:16:11 +0000 (12:16 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 2 Mar 2011 23:16:11 +0000 (12:16 +1300)
commita8c0897643a1d4ffd13e2a2ac61995ea61add124
treea66acc3c7f6e4350dcc6b684260cd971574fd6f2
parentf9f35b69849dca8705df98ff0a21d2b2b1171cc8
parentf8c85a6bc8b6828b619f8e0469e80a175e833c8c
Merge remote branch 'kc/new/bug_5804' into kcmaster