greenfrog86, you should be ok with what your planning on bringing... Oftan they won't include small things such as laptop bags in your carry on allowance. (It kinda depends on the FA you have on the day)
Technically the rule is one carry on item and a small personal item (eg camera, handbag, or laptop bag).
What I usually do is I carry my laptop in my wheely bag (it's got a small compartment for a laptop), as well as a few other items that I will need for the flight (or I would miss if they didn't arrive at the destination), such as a book \ ipod \ coat or jumper \ deodorant \ and sometime a change of clothes. It works quite nicely as I rarely go over the 7kg mark, and it also means that hanging around airports I only have one bag to worry about.