[Merge] lp:~cosme/ubuntu/maverick/codeblocks/codeblocks into lp:ubuntu/maverick/codeblocks

[Cosme Domínguez]

"Either way, this fix should go into the current development release ("natty") before we would consider applying the fix in either lucid or maverick. Can you make sure your merge proposal is based off of the natty branch (lp:ubuntu/codebocks), targetted for merge to the natty branch, and has a changelog entry referencing natty?"

Done

https://code.launchpad.net/~cosme/ubuntu/natty/codeblocks/codeblocks/+merge/42789
-- 
https://code.launchpad.net/~cosme/ubuntu/maverick/codeblocks/codeblocks/+merge/34402
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~cosme/ubuntu/maverick/codeblocks/codeblocks into lp:ubuntu/maverick/codeblocks.