Merge remote branch 'kc/new/bug_5327' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 18 Jan 2011 06:55:12 +0000 (19:55 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 18 Jan 2011 06:55:12 +0000 (19:55 +1300)
commit6c0b51460ea812c27f75058ba33c5e99d1a8e9e3
tree126d749f60b868b7dfa37925b1e69ab72855e72c
parentc8ba99e155cc3357edfc30c23e4b4e5797b241c3
parent71a7d2ad389ff946c5fc65293240caf3d3e290f6
Merge remote branch 'kc/new/bug_5327' into kcmaster