2b136832be
Merge commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3' into gingerbread * commit 'c4367e54e41f4e7a6c79b60dd80e66c9e6fdcfc3': fix code snippet error