Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 14 Sep 2011 20:42:56 +0000 (08:42 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 14 Sep 2011 20:42:56 +0000 (08:42 +1200)
commit6499cfc2c090b79516fa55ee23abbe1cda357150
tree684552544a5f7b4fbf40d619d1190618805321e3
parentcaae541135dedb5d0ccddbf8ffd31887f802332d
parent7cc412d337245b5ffbbb94b5c503e6afd989a3ed
Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster