Iteration-2010-12-15-2.6.x
52ca8c78 · Merge branch '2.6.next' into 2.6.x ·