reorder some parts of the patch to remove the declaration-after- statement warning. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46205