Commit f026f2b9ee5f0aeced5c366c890c4a29eee2a1c7

Carlos Martín Nieto 2011-03-31T15:29:13

Merge upstream/development Signed-off-by: Carlos Martín Nieto <cmn@elego.de>