Merge branch 'master' into dev
Signed-off-by: Wolf wolf@geek.net
Authored by: Wolf 2011-04-28
Parent(s): [76cf08][a3ab54]
Child(ren): [f6375a]