Merge remote-tracking branch 'kc/new/enh/bug_6716' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 13 Sep 2011 02:34:01 +0000 (14:34 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 13 Sep 2011 02:34:01 +0000 (14:34 +1200)
commitaf9ac2fb57d07cef95fc97e3269e844ce7431ed1
tree8c436f9523aded3f1888dbafae3992498017166b
parentae022e9a22a4631216c43399609d8aae62d23fb5
parentf630631218c5b36f5b4333012e40e059850c0ee4
Merge remote-tracking branch 'kc/new/enh/bug_6716' into kcmaster