Merge remote branch 'kc/new/bug_6126' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 13 Apr 2011 00:01:53 +0000 (12:01 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 13 Apr 2011 00:01:53 +0000 (12:01 +1200)
commitce06b67f5e9ec1ca0de3bbf8e03dc5c0f0610fa8
tree322dd40d9f80bfc694b659ec9261f07d39be40e0
parentf11ba1343c0175afb6b6d5eba8cca535a7d1cb57
parent97712c2cca26bc84e8486cbda1b428c489caf070
Merge remote branch 'kc/new/bug_6126' into kcmaster