Added by Dimitris Aragiorgis over 11 years ago
Merge branch 'stable-2.6' into stable-2.6-ippool-hotplug-esi
Conflicts: lib/cmdlib.py
Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>