Merge branch 'new/bug_6479' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 2 Sep 2011 18:35:17 +0000 (06:35 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 2 Sep 2011 18:35:17 +0000 (06:35 +1200)
commitafa94246d3d13993b7add9b34b40be977945f8fd
tree0366f6dcfb1ec99d51c1d7ce7be9d1b1adc6c924
parentf9413ca2d20199a366928926ad8321dde50d12c1
parentacc684bc01fca37615009a778ba5927e40f52d29
Merge branch 'new/bug_6479' into kcmaster