Merge official-6.0 into fixes26
authorP. Christeas <p_christ@hol.gr>
Mon, 24 Jan 2011 11:46:22 +0000 (13:46 +0200)
committerP. Christeas <p_christ@hol.gr>
Mon, 24 Jan 2011 11:46:22 +0000 (13:46 +0200)
commit9ee15e908ebbee6e27ff20164116e1e92e60ecd5
treecc7f10d913c6484d88c20430de1a388d47b9bfd4
parented8e67ab59d1cc870b193730f3791f584b1f44c4
parent3d4a03d84558b6eb97ba56677db5c4dbd7c8bd69
Merge official-6.0 into fixes26

bzr revid: p_christ@hol.gr-20110124114622-m2o2jh27u8wik4oy